Merge branch 'feature/2.0.6-农工商商品兑换券' into develop

order-application-service/src/main/java/cn/freemud/entities/Active.java

@@ -162,5 +162,19 @@ public class Active {
             name = "voucherFaceValue"
     )
     private Integer voucherFaceValue;
+    /**
+     * 限购份数, 仅商品兑换券可用
+     */
+    @JSONField(
+            name = "accountSendOutNum"
+    )
+    private Integer accountSendOutNum;
+    /**
+     * 每份购买张数, 仅商品兑换券可用
+     */
+    @JSONField(
+            name = "accountSendOutAmount"
+    )
+    private Integer accountSendOutAmount;
 
 }

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

@@ -571,7 +571,7 @@ public class SellCouponOrderServiceImpl {
         List<ProductBindingCouponType> productBindingCoupons = new ArrayList<>();
         ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType();
         productBindingCouponType2.setActivityCode(active.getActiveCode());
-        productBindingCouponType2.setNum(1);
+        productBindingCouponType2.setNum(active.getAccountSendOutAmount());
         productBindingCouponType2.setActivityName(active.getActiveName());
         productBindingCoupons.add(productBindingCouponType2);
         orderProductAddInfoDto.setProductBindingCoupons(productBindingCoupons);