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

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

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