Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

@@ -215,7 +215,7 @@ public class CouponPromotionService implements IPromotionService {
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
             if (ActivityTypeEnum.TYPE_34.getCode().compareTo(couponDiscount.getActivityType()) ==0) {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                activityDiscountsDto.setActivityCode(null);
+                activityDiscountsDto.setActivityCode(couponDiscount.getCouponCode());
                 activityDiscountsDto.setActivityName(couponDiscount.getActivityName());
                 activityDiscountsDto.setActivityType(couponDiscount.getActivityType());
                 activityDiscountsDto.setDiscountAmount(couponDiscount.getDiscountAmount());