Merge branch 'master' into pre

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

@@ -523,7 +523,9 @@ public class OrderAdapterServiceImpl {
                 request.setMiniAppId(orderBean.getAppId());
                 response = ecologyProgramApplicationClient.reportActivityBehaviors(request);
                 if (!Objects.equals(response.getCode(), "100")) {
-                    emailAlertService.sendEmailAlert("低碳活动上报失败", String.format("request:%s \r\nresponse:%s \r\norderNo:%s", JSONObject.toJSONString(request), JSONObject.toJSONString(response), orderBean.getOid()));
+                    if(Objects.equals(response.getMessage(), "用户未参加或已退出该活动")){//用户未报名活动的过滤掉
+                        emailAlertService.sendEmailAlert("低碳活动上报失败", String.format("request:%s \r\nresponse:%s \r\norderNo:%s", JSONObject.toJSONString(request), JSONObject.toJSONString(response), orderBean.getOid()));
+                    }
                     ApiLog.printLog("sendLowCarbonToWeixin error "+orderBean.getOid(), message,request,response);
                 }
             }

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

@@ -464,15 +464,38 @@ public class CalculationCommonService {
         }
         //设置行优惠
         List<ActivityDiscountsDto> activityDiscountsDtoList = new ArrayList<>();
-        if (calculationGoods!=null && CollectionUtils.isNotEmpty(calculationGoods.getDiscounts())) {
-            for (GoodsDiscount discount : calculationGoods.getDiscounts()) {
-                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                activityDiscountsDto.setActivityCode(discount.getActivityCode());
-                activityDiscountsDto.setActivityName(this.convertName(discount.getType(), discount.getActivityName()));
-                activityDiscountsDto.setActivityType(this.convertType(discount.getType()));
-                activityDiscountsDto.setDiscountAmount(discount.getDiscount().intValue());
-                activityDiscountsDto.setActualActivityGoodsNumber(discount.getActualGoodsNumber());
-                activityDiscountsDtoList.add(activityDiscountsDto);
+        if (null != calculationGoods) {
+            if (CollectionUtils.isNotEmpty(calculationGoods.getDiscounts())){
+                for (GoodsDiscount discount : calculationGoods.getDiscounts()) {
+                    ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                    activityDiscountsDto.setActivityCode(discount.getActivityCode());
+                    activityDiscountsDto.setActivityName(this.convertName(discount.getType(), discount.getActivityName()));
+                    activityDiscountsDto.setActivityType(this.convertType(discount.getType()));
+                    activityDiscountsDto.setDiscountAmount(discount.getDiscount().intValue());
+                    activityDiscountsDto.setActualActivityGoodsNumber(discount.getActualGoodsNumber());
+                    activityDiscountsDtoList.add(activityDiscountsDto);
+                }
+            } else if (CollectionUtils.isNotEmpty(calculationGoods.getSmallMaterial())) {
+                // fix 若套餐无固定搭配， 促销返回的均摊在父商品上是空的，这时需要把子商品的优惠放到父商品里
+                Map<Integer, ActivityDiscountsDto> map = new HashMap<>();
+                calculationGoods.getSmallMaterial().forEach(sm -> {
+                    if (CollectionUtils.isNotEmpty(sm.getDiscounts())) {
+                        sm.getDiscounts().forEach(discount -> {
+                            Integer type = this.convertType(discount.getType());
+                            ActivityDiscountsDto dto = map.getOrDefault(type, new ActivityDiscountsDto());
+                            dto.setActivityCode(discount.getActivityCode());
+                            dto.setActivityName(this.convertName(discount.getType(), discount.getActivityName()));
+                            dto.setActivityType(this.convertType(discount.getType()));
+                            dto.setDiscountAmount(Optional.ofNullable(dto.getDiscountAmount()).orElse(0) + discount.getDiscount().intValue());
+                            dto.setActualActivityGoodsNumber(Optional.ofNullable(dto.getActualActivityGoodsNumber()).orElse(0) + discount.getActualGoodsNumber());
+                            map.put(type, dto);
+                        });
+                    }
+                });
+                //存到商品优惠里
+                map.forEach((type, dto) -> {
+                    activityDiscountsDtoList.add(dto);
+                });
             }
         }
         cartGoodsDetailDto.setActivityDiscountsDtos(activityDiscountsDtoList);