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

Dev

See merge request quanshu/mp-server!157

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -114,6 +114,8 @@ public class UserDeliverOrderController extends BaseApiController {
     jsonObject.put("orderId", orderId);
     if (orderSettleVO.getPayAmt() > 0) {
       jsonObject.put("needPay", 1);
+    } else {
+      jsonObject.put("needPay", 0);
     }
     // 清除缓存的订单
     redisCache.deleteObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId));

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -155,6 +155,8 @@ public class UserTicketOrderController extends BaseApiController {
     jsonObject.put("orderId", orderId);
     if (orderSettleVO.getPayAmt() > 0) {
       jsonObject.put("needPay", 1);
+    } else {
+      jsonObject.put("needPay", 0);
     }
     // 清除缓存的订单
     redisCache.deleteObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId));

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

@@ -128,6 +128,10 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
         awardsPrize.setPrizeId(bizIdGenerator.newId());
         awardsPrize.setBoxId(ticketBox.getBoxId());
         awardsPrize.setAwardsId(ticketAwards.getAwardsId());
+        if (null == awardsPrize.getQuantity() || 0 == awardsPrize.getQuantity()) {
+          // 页面没设置奖品的具体数量，则默认为整个奖项的数量
+          awardsPrize.setQuantity(ticketAwards.getQuantity());
+        }
         awardsPrize.setRemainQty(awardsPrize.getQuantity());
         awardsPrize.setCashedQty(0);
         if (prizeParam.getPrizeType() == TicketPrizeTypeEnum.GOODS) {