Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git into dev

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

@@ -93,7 +93,7 @@ public class TicketBoxMgrController extends BaseApiController {
 	@PreAuthorize("@ss.hasPermi('business:ticket:list')")
 	public TableDataInfo list(@RequestBody TicketBox ticketBox) {
 		startPage();
-		List<TicketBox> list = ticketBoxService.list(new QueryWrapper<>());
+		List<TicketBox> list = ticketBoxService.list(new QueryWrapper<TicketBox>().orderByDesc("FIELD(`status`, 'wait', 'doing', 'done', 'on', 'off')").orderByDesc("box_id"));
 		return getDataTable(list);
 	}
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelWithdrawController.java

@@ -92,9 +92,9 @@ public class ChannelWithdrawController extends BaseApiController {
         StringUtils.isNotBlank(feeRateValue) ? feeRateValue : FEE_RATE_DEFAULT_VALUE);
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     Channel channel = channelService.getById(channelId);
-    if (channel.getMoney() < 50000) {
+    /*if (channel.getMoney() < 50000) {
       return AjaxResult.error("账户余额不足500元");
-    }
+    }*/
     if (param.getMoney() > channel.getMoney() ) {
       return AjaxResult.error("提现金额超出了余额");
     }