فهرست منبع

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

Mp server test

See merge request quanshu/mp-server!868
zhong chunping 2 سال پیش
والد
کامیت
b0b155f574

+ 1 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -101,7 +101,7 @@ public class UserTicketController extends BaseApiController {
   @PostMapping("/isJump")
   @ApiOperation("是否跳转")
   public AjaxResult isJump() {
-    return AjaxResult.success(false);
+    return AjaxResult.success(true);
   }
 
 

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

@@ -438,7 +438,8 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
         "盲票生成时,票组状态不是出票中,boxId=" + boxId);
     List<TicketAwards> ticketAwardsList = ticketAwardsService.list(
         new LambdaQueryWrapper<TicketAwards>()
-            .eq(TicketAwards::getBoxId, ticketBox.getBoxId()));
+            .eq(TicketAwards::getBoxId, ticketBox.getBoxId())
+            .orderByAsc(TicketAwards::getQuantity));
     // 分包
     int pkgNum = ticketBox.getPkgQty();
     int pkgUnit = ticketBox.getPkgUnit();