Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of…

Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/CalculationDiscountGoodsDto.java

@@ -15,6 +15,9 @@ public class CalculationDiscountGoodsDto {
 
     @NotNull(message = "不可为空")
     private String goodsId;
+
+
+    private String spuId;
     /**
      * 商品数量
      */

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -870,6 +870,7 @@ public class SellCouponOrderServiceImpl {
         List<CalculationDiscountGoodsDto> discountGoodsDtoList = new ArrayList<>();
         CalculationDiscountGoodsDto discountGoodsDto = new CalculationDiscountGoodsDto();
         discountGoodsDto.setGoodsId(products.getPid());
+        discountGoodsDto.setSpuId(products.getPid());
         discountGoodsDto.setGoodsQuantity(1);
         discountGoodsDto.setOriginalPrice(products.getFinalPrice().intValue());
         discountGoodsDtoList.add(discountGoodsDto);