Merge remote-tracking branch 'origin/dev' into dev

mp-quartz/src/main/java/com/qs/mp/quartz/task/DayStatTask.java

@@ -220,10 +220,16 @@ public class DayStatTask {
             .select("IFNULL(sum(money) ,0) as withdrawAmt")
             .lambda().lt(ChannelWithdraw::getCreateTime, DateUtils.addDays(bizDay, 1))
             .eq(ChannelWithdraw::getStatus, ChannelWithdrawStatusEnum.FINISHED));
+    Map<String, Object> allAcctMoneyMap = channelService.getMap(
+        new QueryWrapper<Channel>()
+            .select("IFNULL(sum(money) ,0) as acctAmt"));
     if (null != withdrawMap) {
       sb.append("累计提现：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
                   new BigDecimal(100), 2, RoundingMode.DOWN))
+          .append("元，待提现：").append(
+              new BigDecimal(Integer.valueOf(String.valueOf(allAcctMoneyMap.get("acctAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN))
           .append("元，当日：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(withdrawMap.get("withdrawAmt")))).divide(
                   new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");

mp-service/src/main/java/com/qs/mp/user/service/impl/UserHitPrizeServiceImpl.java

@@ -120,7 +120,7 @@ public class UserHitPrizeServiceImpl extends ServiceImpl<UserHitPrizeMapper, Use
             }
         }
         List<TicketAwardsPrize> awardsPrizes = ticketAwardsPrizeService.list(new LambdaQueryWrapper<TicketAwardsPrize>()
-                .eq(TicketAwardsPrize::getAwardsId, userHitPrize.getAwardsId()).orderByDesc(TicketAwardsPrize::getRemainQty));
+                .eq(TicketAwardsPrize::getAwardsId, userHitPrize.getAwardsId()).orderByDesc(TicketAwardsPrize::getSortWeight).orderByDesc(TicketAwardsPrize::getValue));
         return awardsPrizes;
     }