Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of…

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -303,6 +303,8 @@ public class ActivityCalculationDiscountResponseDto {
             private Integer discountAmount;
 
             private Integer activityType;
+
+            private String activityName;
         }
 
         @Data

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

@@ -204,7 +204,7 @@ public class CalculationServiceImpl {
             if (discountType != null && discountAmount > 0) {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(discount.getCouponCode());
-                activityDiscountsDto.setActivityName(discount.getCouponCode());
+                activityDiscountsDto.setActivityName(discount.getActivityName());
                 activityDiscountsDto.setActivityType(discountType);
                 activityDiscountsDto.setDiscountAmount(0 - discountAmount);
                 activityDiscountsDtos.add(activityDiscountsDto);