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

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

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

@@ -2644,7 +2644,7 @@ public class OrderSdkAdapter {
         for (CreateOrderProductRequest productRequest : products) {
             // 普通商品 订单转换
             productRequest.setOpid(index);
-            originalAmount += updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
+            originalAmount += updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
             if (ProductTypeEnum.MATERIAL_PRODUCT.getCode().equals(productRequest.getProductType())) {
                 if (CollectionUtils.isNotEmpty(productRequest.getMaterialProduct())) {
                     // 父类商品productId=productId+seq
@@ -2654,7 +2654,7 @@ public class OrderSdkAdapter {
                         material.setOpid(index);
                         material.setSpecification(material.getProductId());
                         material.setSpecificationName(material.getProductName());
-                        updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, partnerProductId, true);
+                        updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, partnerProductId, true);
                     }
                 }
             }
@@ -2663,7 +2663,7 @@ public class OrderSdkAdapter {
                 // 父类商品productId=productId+seq
                 String partnerProductId = productRequest.getProductId() + "_" + index;
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
-                    productRequest.getComboProduct().forEach(combo -> updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, combo, partnerId, partnerProductId, false));
+                    productRequest.getComboProduct().forEach(combo -> updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, combo, partnerId, partnerProductId, false));
                 }
             }
             index++;
@@ -2685,7 +2685,7 @@ public class OrderSdkAdapter {
         for (CreateOrderProductRequest productRequest : products) {
             // 普通商品 订单转换
             productRequest.setOpid(index);
-            originalAmount += updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
+            originalAmount += updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "", false);
             // 如果是套餐商品，需要转换当前商品行子集ComboProduct&GroupProduct（固定商品、可选商品）
             if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), productRequest.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), productRequest.getProductType())) {
                 // 父类商品productId=productId+seq
@@ -2693,13 +2693,13 @@ public class OrderSdkAdapter {
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
                     for(CreateOrderProductRequest combo : productRequest.getComboProduct()) {
                         combo.setOpid(comboIndex);
-                        updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, combo, partnerId, parentProductId, false);
+                        updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, combo, partnerId, parentProductId, false);
                         if(CollectionUtils.isNotEmpty(combo.getMaterialProduct())) {
                             String addProductId = combo.getProductId() + "_" + comboIndex;
                             for(CreateOrderProductRequest material : combo.getMaterialProduct()) {
                                 material.setSpecification(material.getProductId());
                                 material.setSpecificationName(material.getProductName());
-                                updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
+                                updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
                             }
                         }
                         comboIndex++;
@@ -2711,7 +2711,7 @@ public class OrderSdkAdapter {
                 for (CreateOrderProductRequest material: productRequest.getMaterialProduct()){
                     material.setSpecification(material.getProductId());
                     material.setSpecificationName(material.getProductName());
-                    updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
+                    updateOrderItemAndSettlement(productRequest, orderItemList, orderSettlementCreateReqList, material, partnerId, addProductId, true);
                 }
             }
             index++;
@@ -2729,7 +2729,7 @@ public class OrderSdkAdapter {
      * @param parentProductId              套餐父商品Id
      * @return
      */
-    private Long updateOrderItemAndSettlement(List<OrderItemCreateReq> orderItemList, List<OrderSettlementCreateReq> orderSettlementCreateReqList, CreateOrderProductRequest product, String partnerId, String parentProductId, Boolean isMaterial) {
+    private Long updateOrderItemAndSettlement(CreateOrderProductRequest productRequest, List<OrderItemCreateReq> orderItemList, List<OrderSettlementCreateReq> orderSettlementCreateReqList, CreateOrderProductRequest product, String partnerId, String parentProductId, Boolean isMaterial) {
         OrderItemCreateReq orderItemCreateReq = new OrderItemCreateReq();
         orderItemCreateReq.setId(product.getId());
         orderItemCreateReq.setPartnerId(partnerId);
@@ -2861,11 +2861,11 @@ public class OrderSdkAdapter {
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(extInfo));
 
         // 拼单加购人信息 add by miaohui 2020.10.12 start
-        orderItemCreateReq.setUserId(product.getUserId());
-        orderItemCreateReq.setOpenId(product.getOpenId());
-        orderItemCreateReq.setNickName(product.getNickName());
-        orderItemCreateReq.setPhotoUrl(product.getPhotoUrl());
-        orderItemCreateReq.setPackPrice(product.getPackPrice());
+        orderItemCreateReq.setUserId(productRequest.getUserId());
+        orderItemCreateReq.setOpenId(productRequest.getOpenId());
+        orderItemCreateReq.setNickName(productRequest.getNickName());
+        orderItemCreateReq.setPhotoUrl(productRequest.getPhotoUrl());
+        orderItemCreateReq.setPackPrice(productRequest.getPackPrice());
         // 拼单加购人信息 add by miaohui 2020.10.12 end
 
         orderItemList.add(orderItemCreateReq);

assortment-shoppingcart-sdk/readme.md

@@ -12,3 +12,4 @@
 | 1.1.5.RELEASE| 商品加料    |  | 2020-08-24  |
 | 1.1.6.RELEASE| 新增商品券名称字段| 孙昱 | 2020-11-09 |
 | 1.1.7.RELEASE| 标识套餐类型| 孙昱 | 2020-12-01 |
+| 1.1.8.RELEASE| 拼单| 缪晖 | 2020-12-10 |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.20-SNAPSHOT</version>
+            <version>2.1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -103,6 +103,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setOpenId(cartGoods.getOpenId());
         cartGoodsDetailDto.setUserName(cartGoods.getUserName());
         cartGoodsDetailDto.setPhotoUrl(cartGoods.getPhotoUrl());
+        cartGoodsDetailDto.setPackPrice(cartGoods.getPackPrice());
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java

@@ -171,7 +171,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
         long count = cartGoodsList.stream().filter(c -> c.getSpuId().equals(cartGoods.getSpuId())).count();
         //购物车内存在同类
         if (count>0) {
-            CartGoods find = cartGoodsList.stream().filter(c -> c.getCartGoodsUid().equals(cartGoods.getOriginalGoodsUid())).findFirst().orElseGet(null);
+            CartGoods find = cartGoodsList.stream().filter(c -> c.getCartGoodsUid().equals(cartGoods.getOriginalGoodsUid())).findFirst().orElse(null);
             if (null == find) {
                 find = cartGoodsList.stream().filter(c -> c.getSpuId().equals(cartGoods.getSpuId())).findFirst().get();
             }