fix:可选商品折扣

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

@@ -404,6 +404,8 @@ public class CalculationCommonService {
         if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
             HashMap<String, BlockRow> smDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, false);
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> groupList = this.com2DetailGoods(smDiscount, cartGoods.getProductGroupList(), cartGoods, false);
+            int discountSum = groupList.stream().mapToInt(ShoppingCartGoodsDto.CartGoodsDetailDto::getTotalDiscountAmount).sum();
+            cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount()+discountSum);
             combs.addAll(groupList);
         }
         cartGoodsDetailDto.setComboProducts(combs);

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

@@ -165,7 +165,7 @@ public class CalculationSharingEquallyService {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(discount.getActivityCode());
                 activityDiscountsDto.setActivityName(discount.getActivityName());
-                activityDiscountsDto.setActivityType(discountType);
+                activityDiscountsDto.setActivityType(calculationCommonService.convertType(discountType));
                 activityDiscountsDto.setDiscountAmount(0 - discountAmount);
                 activityDiscountsDtos.add(activityDiscountsDto);
             }