Merge branch 'ka-促销需要商品券的spuid' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

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

@@ -18,7 +18,6 @@ import cn.freemud.service.active.ActiveService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
-import cn.freemud.entities.dto.activity.DiscountSharingDto;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
@@ -391,6 +390,7 @@ public class CalculationSharingDiscountService {
         calculationDiscountGoods.setOriginalPrice(originalPrice);
         calculationDiscountGoods.setMemberDiscount(100);
         calculationDiscountGoods.setCouponCode(couponCode);
+        calculationDiscountGoods.setSpuId(cartGoods.getSpuId());
         this.setCalculationDiscountGoods(calculationDiscountGoodsList, calculationDiscountGoods);
     }