Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2334,6 +2334,10 @@ public class OrderAdapter {
         if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
             List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
             cartGoodsDetailDto.getComboProducts().forEach(product -> {
+                product.setUserId(cartGoodsDetailDto.getUserId());
+                product.setUserName(cartGoodsDetailDto.getUserName());
+                product.setOpenId(cartGoodsDetailDto.getOpenId());
+                product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
                 comboProducts.add(convent2OrderProductDemo(product));
             });
             createOrderProductDemoDto.setComboProduct(comboProducts);
@@ -2342,6 +2346,10 @@ public class OrderAdapter {
         if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.MATERIALPRODUCT_UPPRICE.getCode())) {
             List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
             cartGoodsDetailDto.getMaterialList().forEach(product -> {
+                product.setUserId(cartGoodsDetailDto.getUserId());
+                product.setUserName(cartGoodsDetailDto.getUserName());
+                product.setOpenId(cartGoodsDetailDto.getOpenId());
+                product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
                 materialProducts.add(convent2OrderProductMaterial(product));
             });
             createOrderProductDemoDto.setMaterialProduct(materialProducts);

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

@@ -694,7 +694,9 @@ public class ShoppingCartConvertAdapter {
             productComboType = parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductTypeBeanDTO.ProductComboType());
         } else {
             Map<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> map = new HashMap<>();
-            parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
+            if (CollectionUtils.isNotEmpty(parentProductBean.getAdditionalGroupList())){
+                parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
+            }
             groupDetailType = map.get(comboxGoods.getGoodsId());
         }
 

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

@@ -738,11 +738,12 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
      * 重新计算拼单购物车行总折扣金额
      */
     private void updateTotalDiscountAmount(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto) {
-        if (null != shoppingCartGoodsDto && null != shoppingCartGoodsDto.getProducts() && null != calculationDiscountResult.getGoods()) {
+        if (null != shoppingCartGoodsDto && null != shoppingCartGoodsDto.getProducts() && null != calculationDiscountResult && null != calculationDiscountResult.getGoods()) {
             shoppingCartGoodsDto.getProducts().stream().forEach(product -> {
                 calculationDiscountResult.getGoods().stream().forEach(goods -> {
                     if (goods.getCartGoodsUid().equals(product.getCartGoodsUid())) {
-                        product.setTotalDiscountAmount(Integer.valueOf(String.valueOf(goods.getDiscountAmount())));
+                        long totalDiscountAmount = product.getOriginalPrice() * product.getQty() - goods.getRealAmount();
+                        product.setTotalDiscountAmount(Integer.valueOf(String.valueOf(totalDiscountAmount)));
                     }
                 });
             });