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

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

@@ -992,11 +992,17 @@ 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) {
                             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

@@ -549,7 +549,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 {