fix 随单购商品折扣

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -187,6 +187,17 @@ public class CouponDiscountCalculation {
                         cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
                     }
                 }
+                if (discount != null){
+                    ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                    activityDiscountsDto.setActivityCode(discount.getActivityCode());
+                    activityDiscountsDto.setActivityName(discount.getActivityName());
+                    activityDiscountsDto.setActivityType(discount.getType());
+                    activityDiscountsDto.setDiscountAmount(0 - discount.getDiscount());
+                    productActivityDiscountsDtos.add(activityDiscountsDto);
+                    cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
+                    cartGoods.setSalePrice(0L);
+                    cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
+                }
 
                 if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
                     continue;