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

Dev

See merge request quanshu/mp-server!466

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

@@ -178,7 +178,8 @@ public class DayStatTask {
             .lt(ChannelCommission::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     Map<String, Object> allCommMap = channelCommissionService.getMap(
         new QueryWrapper<ChannelCommission>()
-            .select("IFNULL(sum(comm_amt) ,0) as commAmt"));
+            .select("IFNULL(sum(comm_amt) ,0) as commAmt")
+            .lambda().lt(ChannelCommission::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     if (null != commMap) {
       sb.append("累计分佣：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(allCommMap.get("commAmt")))).divide(
@@ -197,7 +198,8 @@ public class DayStatTask {
     Map<String, Object> allCouponMap = channelCouponVerifyLogService.getMap(
         new QueryWrapper<ChannelCouponVerifyLog>()
             .select("IFNULL(sum(discount) ,0) as discount")
-            .lambda().eq(ChannelCouponVerifyLog::getDiscountType, CouponDiscountTypeEnum.MONEY_OFF));
+            .lambda().lt(ChannelCouponVerifyLog::getCreatedTime, DateUtils.addDays(bizDay, 1))
+            .eq(ChannelCouponVerifyLog::getDiscountType, CouponDiscountTypeEnum.MONEY_OFF));
     if (null != commMap) {
       sb.append("累计核销：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(allCouponMap.get("discount")))).divide(
@@ -216,7 +218,8 @@ public class DayStatTask {
     Map<String, Object> allWithdrawMap = channelWithdrawService.getMap(
         new QueryWrapper<ChannelWithdraw>()
             .select("IFNULL(sum(money) ,0) as withdrawAmt")
-            .lambda().eq(ChannelWithdraw::getStatus, ChannelWithdrawStatusEnum.FINISHED));
+            .lambda().lt(ChannelWithdraw::getCreateTime, DateUtils.addDays(bizDay, 1))
+            .eq(ChannelWithdraw::getStatus, ChannelWithdrawStatusEnum.FINISHED));
     if (null != withdrawMap) {
       sb.append("累计提现：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
@@ -229,7 +232,8 @@ public class DayStatTask {
     int exCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>()
         .ge(UserExchangeOrder::getCreatedTime, bizDay)
         .lt(UserExchangeOrder::getCreatedTime, DateUtils.addDays(bizDay, 1)));
-    int allExCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>());
+    int allExCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>()
+        .lt(UserExchangeOrder::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     sb.append("累计兑换订单：").append(allExCnt).append("个，当日：").append(exCnt).append("个\n");
 
     Map<String, Object> deliverMap = userCoinLogService.getMap(new QueryWrapper<UserCoinLog>()
@@ -239,7 +243,8 @@ public class DayStatTask {
         .lt(UserCoinLog::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     Map<String, Object> allDeliverMap = userCoinLogService.getMap(new QueryWrapper<UserCoinLog>()
         .select("IFNULL(sum(log_money) ,0) as deliverAmt")
-        .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.PRIZE));
+        .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.PRIZE)
+        .lt(UserCoinLog::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     if (null != deliverMap) {
       sb.append("累计派发盲豆：").append(Integer.valueOf(String.valueOf(allDeliverMap.get("deliverAmt"))))
           .append("颗，当日：").append(Integer.valueOf(String.valueOf(deliverMap.get("deliverAmt"))))
@@ -253,7 +258,8 @@ public class DayStatTask {
         .lt(UserCoinLog::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     Map<String, Object> allExchangeMap = userCoinLogService.getMap(new QueryWrapper<UserCoinLog>()
         .select("IFNULL(sum(log_money) ,0) as exchangeAmt")
-        .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.EXCHANGE));
+        .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.EXCHANGE)
+        .lt(UserCoinLog::getCreatedTime, DateUtils.addDays(bizDay, 1)));
     if (null != withdrawMap) {
       sb.append("累计兑换盲豆：").append(0 - Integer.valueOf(String.valueOf(allExchangeMap.get("exchangeAmt"))))
           .append("颗，当日：").append(0 - Integer.valueOf(String.valueOf(exchangeMap.get("exchangeAmt"))))

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

@@ -30,6 +30,6 @@ public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeM
   @Override
   public List<TicketAwardsPrizeVO> listPrizeVO(String boxId) {
     return listPrizeVO(new QueryWrapper<TicketAwardsPrize>()
-        .eq("t1.box_id", boxId).eq("t2.is_deleted", 0).orderByAsc("t1.sort").orderByDesc("t2.sort_weight, t2.value"));
+        .eq("t1.box_id", boxId).eq("t2.is_deleted", 0).orderByAsc("t1.sort").orderByDesc("t2.sort_weight").orderByDesc("t2.value"));
   }
 }