1、自定義食品不可合併報錯處理

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java

@@ -1221,7 +1221,8 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
         List<Integer> removeIndexs = new ArrayList<>();
         List<Integer> removeIndexs = new ArrayList<>();
         for (int i = 0; i < foodList.size(); i++) {
         for (int i = 0; i < foodList.size(); i++) {
             OrderDetail orderFood = foodList.get(i);
             OrderDetail orderFood = foodList.get(i);
-            if (!orderFood.isNew() || orderFood.getItemType() != 1 || orderFood.getCustomType() != Food.CUSTOM_TYPE_100) {
+            boolean customFood = (orderFood.getCustomType() != null && orderFood.getCustomType() != Food.CUSTOM_TYPE_100);
+            if (!orderFood.isNew() || orderFood.getItemType() != 1 || customFood) {
                 continue;
                 continue;
             }
             }
             if (hasChildFood(foodList, orderFood)) {
             if (hasChildFood(foodList, orderFood)) {

config.gradle

@@ -7,8 +7,8 @@ ext {
             targetSdkVersion : 29,
             targetSdkVersion : 29,
             //正式版:    1.0.3  3
             //正式版:    1.0.3  3
             //內部測試版:1.2.0  20
             //內部測試版:1.2.0  20
-            versionCode      : 31,
-            versionName      : "1.3.1"
+            versionCode      : 32,
+            versionName      : "1.3.2"
     ]
     ]
 
 
     version = [
     version = [

library-order/src/main/java/com/gingersoft/gsa/cloud/order/commodity/OrderDetail.java

@@ -1170,7 +1170,7 @@ public class OrderDetail implements Commodity, Serializable, Cloneable {
         orderDetail.setPrintseting(food.getPrintSeting());
         orderDetail.setPrintseting(food.getPrintSeting());
         orderDetail.setIsfood(true);
         orderDetail.setIsfood(true);
         orderDetail.setNew(true);
         orderDetail.setNew(true);
-        orderDetail.setCustomType(food.getCustomType());
+        orderDetail.setCustomType(food.ableDiscountCastCustomType());
         orderDetail.setType(FOOD_TYPE);
         orderDetail.setType(FOOD_TYPE);
         orderDetail.setItemType(1);
         orderDetail.setItemType(1);
         orderDetail.setProp(FOOD_PROP);
         orderDetail.setProp(FOOD_PROP);