Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.1.RELEASE</version>
+    <version>1.1.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -4,4 +4,5 @@
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
 | 6.4.10.RELEASE| 骑手小费  | 张明警 | 2019-12-26  |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
-| 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
\ No newline at end of file
+| 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
+| 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
\ No newline at end of file

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/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.1.RELEASE</version>
+            <version>1.1.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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 {

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.0.RELEASE</version>
+    <version>1.1.1.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -3,4 +3,5 @@
 | 版本号       | 版本说明         | 更新人 | 更新时间   |
 | ------------ | ---------------- | ------ | ---------- |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
-| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
\ No newline at end of file
+| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
+| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
\ No newline at end of file