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

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -325,13 +325,10 @@ public class CommonController {
         }
         return R.ok();
     }
-    @PostMapping("/updateRedPack")
-    public R updateRedPack(){
-        LocalDateTime now = LocalDateTime.now();
-        // 获取上一个小时的开始时间
-        LocalDateTime startTime = LocalDateTime.of(2025, 9, 29, 14, 0, 0, 0);
-        // 获取上一个小时的结束时间
-        LocalDateTime endTime = LocalDateTime.of(2025, 9, 30, 8, 59, 59, 59);
+    @GetMapping("/updateRedPack")
+    public R updateRedPack(String start , String end    ){
+        LocalDateTime startTime = DateUtil.parseLocalDateTime(start);
+        LocalDateTime endTime = DateUtil.parseLocalDateTime(end);
         List<RedPacketMoneyVO> redPacketMoneyVOS = fsCourseRedPacketLogMapper.selectFsCourseRedPacketLogHourseByCompany(startTime, endTime);
         for (RedPacketMoneyVO redPacketMoneyVO : redPacketMoneyVOS) {
             companyService.subtractCompanyMoneyHourse(redPacketMoneyVO.getMoney(),redPacketMoneyVO.getCompanyId(), startTime.toLocalTime(), endTime.toLocalTime());

fs-qw-task/src/main/java/com/fs/app/task/qwTask.java

@@ -372,14 +372,11 @@ public class qwTask {
             companyTrafficRecordService.refreshTraffic();
         }
     }
-    /**
-     * 每天扣除流量余额
-     * */
     @Scheduled(cron = "0 3 * * * ?")
     public void refreshCompanyMoney(){
         SysConfig config = configService.selectConfigByConfigKey("medicalMall.func.switch");
         MedicalMallConfig medicalMallConfig = JSON.parseObject(config.getConfigValue(), MedicalMallConfig.class);
-        log.info("是否更新流量：{}", medicalMallConfig.isStatics());
+        log.info("是否更新红包：{}", medicalMallConfig.isStatics());
         if(medicalMallConfig.isStatics()) {
             LocalDateTime now = LocalDateTime.now();
             // 获取上一个小时的开始时间

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -553,7 +553,7 @@ public class CompanyServiceImpl implements ICompanyService
                 companyMapper.updateCompany(company);
                 CompanyMoneyLogs log=new CompanyMoneyLogs();
                 log.setCompanyId(company.getCompanyId());
-                log.setRemark("扣除"+start.getHour()+"到"+end.getHour()+"点红包金额");
+                log.setRemark("扣除"+start.getHour()+"点红包金额");
                 log.setMoney(money.multiply(new BigDecimal(-1)));
                 log.setLogsType(15);
                 log.setBalance(company.getMoney());