fix

play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java

@@ -54,7 +54,7 @@ public class ClerkWagesSettlementTask {
      * 每分钟查询未结算订单
      * 如果订单完成时间超过24小时，可进行结算，生成工资
      */
-    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void dailyRanking() {
         // 1、查询所有的租户信息
         List<SysTenantEntity> tenantEntities = sysTenantService.listAll();

play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java

@@ -46,7 +46,7 @@ public class OrderRankingSettlementTask {
      * 当日订单结算，查询前一日的订单信息，生成订单排名数据
      * 每天凌晨0点5分0秒时触发执行
      */
-    @Scheduled(cron = "0 10 0 * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void dailyRanking() {
         // 1、查询所有的租户信息
         List<SysTenantEntity> tenantEntities = sysTenantService.listAll();
@@ -110,13 +110,14 @@ public class OrderRankingSettlementTask {
                 ordersExpiredNumber++;
             }
         }
-        BigDecimal orderContinueProportion = new BigDecimal(ordersExpiredNumber).divide(new BigDecimal(orderNumber), 4, RoundingMode.HALF_UP).add(new BigDecimal(100));
+        BigDecimal orderContinueProportion = orderNumber == 0 ? BigDecimal.ZERO : new BigDecimal(ordersExpiredNumber).divide(new BigDecimal(orderNumber), 4, RoundingMode.HALF_UP).add(new BigDecimal(100));
-        BigDecimal averageUnitPrice = orderMoney.divide(new BigDecimal(customIds.size()), 4, RoundingMode.HALF_UP);
+        BigDecimal averageUnitPrice = customIds.isEmpty() ? BigDecimal.ZERO : orderMoney.divide(new BigDecimal(customIds.size()), 4, RoundingMode.HALF_UP);
         PlayClerkRankingInfoEntity rankingInfo = new PlayClerkRankingInfoEntity();
         rankingInfo.setId(rankingId);
         rankingInfo.setClerkId(clerkId);
         rankingInfo.setStartCountDate(startTime);
         rankingInfo.setEndCountDate(endTime);
+        rankingInfo.setWeeklyRanking("0");
         rankingInfo.setOrderNumber(orderInfoEntities.size());
         rankingInfo.setSerialNumber(newSerialNumber + 1);
         rankingInfo.setOrderMoney(orderMoney);

play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java

@@ -28,7 +28,7 @@ public class PlayClerkRankingInfoController {
     /**
      * 查询店员排行列表
      */
-    @GetMapping("/listByPage")
+    @PostMapping("/listByPage")
     public R list(@Validated @RequestBody IPlayClerkRankingInfoQueryVo vo) {
         IPage<IPlayClerkRankingInfoReturnVo> list = playClerkRankingInfoService.selectByPage(vo);
         return R.ok(list);

play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/IPlayClerkRankingInfoQueryVo.java

@@ -21,6 +21,11 @@ public class IPlayClerkRankingInfoQueryVo extends BasePageEntity {
      */
     private String weeklyRanking;
 
+    /**
+     * 是否为历史统计(1:是;0:不是)
+     */
+    private String historicalStatistics;
+
 
     /**
      * 店员ID

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java

@@ -37,7 +37,7 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl<PlayClerkRankin
         MPJLambdaWrapper<PlayClerkRankingInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
         lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class);
         // 拼接店员表
-        lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickName").selectAs(PlayClerkUserInfoEntity::getSex,"clerkSex");
+        lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getSex,"clerkSex");
         lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId);
         if (StrUtil.isNotBlank(vo.getClerkId())) {
             lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, vo.getClerkId());
@@ -45,12 +45,16 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl<PlayClerkRankin
         if (StrUtil.isNotBlank(vo.getWeeklyRanking())) {
             lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getWeeklyRanking, vo.getWeeklyRanking());
         }
+        if (StrUtil.isNotBlank(vo.getHistoricalStatistics())) {
+            lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getHistoricalStatistics, vo.getHistoricalStatistics());
+        }
         if (StrUtil.isNotBlank(vo.getSex())) {
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getSex, vo.getSex());
         }
         if (vo.getSettlementDate() != null) {
             lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSettlementDate, vo.getSettlementDate());
         }
+        lambdaQueryWrapper.orderByAsc(PlayClerkRankingInfoEntity::getRankingIndex);
         return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), IPlayClerkRankingInfoReturnVo.class, lambdaQueryWrapper);
     }