Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -2221,7 +2221,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 }
                 CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
                 coupon.setCode(cp.getCouponCode());
-                coupon.setActivityCode(cp.getCouponCode());
+                coupon.setActivityCode(cp.getActivityCode());
                 coupon.setUseIndex(cp.getIndex() == null ? x + oldCoupons.size():  cp.getIndex() + oldCoupons.size());
                 oldCoupons.add(coupon);
             }