Merge branch 'feature/1.9.9-围餐-20191218-dingkai'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2481,6 +2481,13 @@ public class OrderSdkAdapter {
         createOrderProductRequest.setUnit(productBean.getUnit());
         createOrderProductRequest.setId(productBean.getId());
         createOrderProductRequest.setProductType(productBean.getProductType());
+        OrderProductAddInfoDto extInfo = JSONObject.parseObject(productBean.getExtInfo(), OrderProductAddInfoDto.class);
+        if(extInfo != null) {
+            createOrderProductRequest.setIsFixedProduct(extInfo.getIsFixedProduct());
+            createOrderProductRequest.setThirdProductSpecId(extInfo.getThirdProductSpecId());
+            createOrderProductRequest.setThirdProductPropertyId(extInfo.getThirdProductPropertyId());
+        }
+
         if (productBean.getWeight() != null) {
             createOrderProductRequest.setWeight(productBean.getWeight().doubleValue());
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -992,11 +992,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 updateOrderProductInfoRequest.getOrderItemList().forEach( t -> {
                     CreateOrderProductRequest createOrderProductRequest = createOrderProductRequestMap.get(t.getId());
                     if(createOrderProductRequest != null) {
-                        if(!isDeleted) {
-                            createOrderProductRequest.setWeight(t.getWeight());
+                        createOrderProductRequest.setIsDeleted(isDeleted);
+                        if(isDeleted) {
+                            if(CollectionUtils.isNotEmpty(createOrderProductRequest.getComboProduct())) {
+                                createOrderProductRequest.getComboProduct().forEach(ct -> {
+                                    ct.setIsDeleted(true);
+                                });
+                            }
                             deletedOrderProductList.add(createOrderProductRequest);
+                        } else {
+                            if(t.getWeight() != null && t.getWeight() > 0D) {
+                                createOrderProductRequest.setWeight(t.getWeight());
+                            }
+                            if(t.getNumber() != null && t.getNumber() > 0) {
+                                createOrderProductRequest.setNumber(t.getNumber());
+                            }
                         }
-                        createOrderProductRequest.setIsDeleted(isDeleted);
                     }
                 });
             }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -575,7 +575,7 @@ public class OrderServiceImpl implements Orderservice {
         JSONObject jsonObject = JSONObject.parseObject(res);
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
-            if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code)) {
+            if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
                 //  新版支付成功的情况下code为100
                 return newSendPaySuccessNoticeMessage();
             } else {