Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!483

mp-admin/src/main/resources/application-8100.yml

@@ -138,3 +138,7 @@ miniprogram:
 # 盲票导出每页查询数量
 export:
   page-size: 1000
+
+shipping:
+  user: 1
+  channel: 2

mp-admin/src/main/resources/application-8200.yml

@@ -138,3 +138,7 @@ miniprogram:
 # 盲票导出每页查询数量
 export:
   page-size: 1000
+
+shipping:
+  user: 1
+  channel: 2

mp-service/src/main/java/com/qs/mp/admin/service/impl/CouponPkgServiceImpl.java

@@ -75,7 +75,9 @@ public class CouponPkgServiceImpl extends ServiceImpl<CouponPkgMapper, CouponPkg
             throw new ServiceException("券包下优惠券不存在");
         }
         for (CouponPkgItem couponPkgItem : couponPkgItems) {
-            couponService.distribute(ticket, userId, couponPkgItem.getCouponId().toString());
+            for (int i = 0; i < couponPkgItem.getCouponNum(); i++) {
+                couponService.distribute(ticket, userId, couponPkgItem.getCouponId().toString());
+            }
         }
     }