浏览代码

暂停定时任务

ssk 22 小时之前
父节点
当前提交
3cfd1a79db

+ 6 - 6
alien-store/src/main/java/shop/alien/store/job/DeliciousFoodJob.java

@@ -61,7 +61,7 @@ public class DeliciousFoodJob {
     /**
      * 美食筛选标签定时存储数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void deliciousFoodJob() {
         // 获取所有美食筛选
         List<EssentialModuleInformation> essentialModuleInformations = informationMapper.selectList(
@@ -486,7 +486,7 @@ public class DeliciousFoodJob {
     /**
      * 酒店和民宿筛选标签定时存储数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void hotelAndHomestayJob() {
         // 获取所有酒店民宿筛选
         List<EssentialModuleInformation> essentialModuleInformations = informationMapper.selectList(
@@ -1033,7 +1033,7 @@ public class DeliciousFoodJob {
     /**
      * 汗蒸洗浴筛选标签定时存储数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void takeABathAndSaunaJob() {
         // 获取所有洗浴汗蒸筛选
         List<EssentialModuleInformation> essentialModuleInformations = informationMapper.selectList(
@@ -1284,7 +1284,7 @@ public class DeliciousFoodJob {
     /**
      * 丽人美发筛选标签定时存储数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void lirenHairdressingJob() {
         // 获取所有丽人筛选
         List<EssentialModuleInformation> essentialModuleInformations = informationMapper.selectList(
@@ -1299,7 +1299,7 @@ public class DeliciousFoodJob {
     /**
      * 运动健身筛选标签定时存储数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void sportsAndFitnessJob() {
         // 获取所有的运动健身1级菜单
         List<EssentialModuleInformation> moduleInformations = informationMapper.selectList(
@@ -1385,7 +1385,7 @@ public class DeliciousFoodJob {
     /**
      * 医美医疗筛选标签定时存储数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void medicalAestheticsJob() {
         // 获取所有医美医疗筛选标签
         List<EssentialModuleInformation> essentialModuleInformations = informationMapper.selectList(

+ 1 - 1
alien-store/src/main/java/shop/alien/store/job/KTVJob.java

@@ -37,7 +37,7 @@ public class KTVJob {
 
     private final StoreLabelTypeMapper storeLabelTypeMapper;
 
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void ktvJob() {
 
         // 获取所有的商家信息

+ 1 - 1
alien-store/src/main/java/shop/alien/store/job/MassageFootBathJob.java

@@ -49,7 +49,7 @@ public class MassageFootBathJob {
 
     private final StoreLabelTypeMapper storeLabelTypeMapper;
 
-    @Scheduled(cron = "0 0 0/2 * * ?")
+//    @Scheduled(cron = "0 0 0/2 * * ?")
     public void MassageFootBathJob() {
 
         // 获取所有足浴按摩筛选

+ 2 - 2
alien-store/src/main/java/shop/alien/store/job/StoreMembershipCardJob.java

@@ -61,7 +61,7 @@ public class StoreMembershipCardJob {
     /**
      * 会员卡状态及会员卡订单状态变更任务
      */
-    @Scheduled(cron = "0 0 2 * * ?")
+//    @Scheduled(cron = "0 0 2 * * ?")
 //    @Scheduled(cron = "0/10 * * * * ?")
     public void storeMembershipCardStatusJob() {
         log.info("会员卡状态及会员卡订单状态变更任务执行: " + new Date());
@@ -120,7 +120,7 @@ public class StoreMembershipCardJob {
     /**
      * 定时清理已申请注销超过7天的商家与用户
      */
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")
     public void cancellationOfBusinessJob() {
         log.info("删除已申请注销超过7天的商家与用户: " + new Date());
 

+ 35 - 32
alien-store/src/main/java/shop/alien/store/task/ScheduledTask.java

@@ -66,13 +66,13 @@ public class ScheduledTask {
 
     private final BaseRedisService baseRedisService;
 
-    @Scheduled(cron = "0 */10 * * * ?")
+//    @Scheduled(cron = "0 */10 * * * ?")
     public void sendDiscountCouponRemind() {
         //查询
 
     }
 
-    @Scheduled(cron = "0 */10 * * * ?")
+//    @Scheduled(cron = "0 */10 * * * ?")
     // 该方法用于定时更新生活优惠券(LifeCoupon)的状态
     public void quanStatusUpdateTask() {
         //执行修改代金券状态
@@ -157,7 +157,7 @@ public class ScheduledTask {
         }
     }
 
-    @Scheduled(cron = "0 */10 * * * ?")
+//    @Scheduled(cron = "0 */10 * * * ?")
     public void orderStatusUpdateTask() {
         Date now = new Date();
         Calendar calendar = Calendar.getInstance();
@@ -197,7 +197,7 @@ public class ScheduledTask {
      * 自动转账
      * 一分钟执行一次
      */
-    @Scheduled(cron = "0 */1 * * * ?")
+//    @Scheduled(cron = "0 */1 * * * ?")
     public void autoTransferAccounts() {
         //获取已到账期
         LambdaQueryWrapper<StoreIncomeDetailsRecord> wrapper = new LambdaQueryWrapper<>();
@@ -228,33 +228,36 @@ public class ScheduledTask {
             if (money < 10) {
                 log.info("账户已到账期金额小于最小转账金额, 用户id: {},金额: {}", storeId, money);
             } else {
-                StoreUser filteredUsers = storeUserList.stream()
+                List<StoreUser> userList = storeUserList.stream()
                         .filter(storeUser -> storeUser.getStoreId().equals(storeId))
-                        .collect(Collectors.toList()).get(0);
-                StoreAliPayLog pay = aliApi.pay(filteredUsers.getName(), filteredUsers.getIdCard(), filteredUsers.getPhone(), new BigDecimal(money).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
-                if (null == pay) {
-                    log.error("支付宝转账失败, 用户: {},金额: {}", filteredUsers.getPhone(), money);
-                } else {
-                    StoreCashOutRecord storeCashOutRecord = new StoreCashOutRecord();
-                    //转账记录表
-                    storeCashOutRecord.setStoreId(storeId)
-                            .setMoney(money)
-                            .setCommission(storeCommission.get(storeId))
-                            .setCashOutType(1)
-                            .setOrderNo(pay.getOutBizNo())
-                            .setAliOrderNo(pay.getOrderId())
-                            .setIncomeStartTime(groupedByStoreId.get(storeId).get(0).getCreatedTime())
-                            .setIncomeEndTime(groupedByStoreId.get(storeId).get(groupedByStoreId.get(storeId).size() - 1).getCreatedTime())
-                            .setPaymentDate(new Date());
-                    storeCashOutRecordService.save(storeCashOutRecord);
-                    list.forEach(record -> {
-                        if (record.getStoreId().equals(storeId)) {
-                            record.setCashOutId(storeCashOutRecord.getId());
-                        }
-                    });
-                    //减少金额
-                    filteredUsers.setMoney(filteredUsers.getMoney() - money);
-                    storeUserService.updateById(filteredUsers);
+                        .collect(Collectors.toList());
+                if (!userList.isEmpty()) {
+                    StoreUser filteredUsers = userList.get(0);
+                    StoreAliPayLog pay = aliApi.pay(filteredUsers.getName(), filteredUsers.getIdCard(), filteredUsers.getPhone(), new BigDecimal(money).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
+                    if (null == pay) {
+                        log.error("支付宝转账失败, 用户: {},金额: {}", filteredUsers.getPhone(), money);
+                    } else {
+                        StoreCashOutRecord storeCashOutRecord = new StoreCashOutRecord();
+                        //转账记录表
+                        storeCashOutRecord.setStoreId(storeId)
+                                .setMoney(money)
+                                .setCommission(storeCommission.get(storeId))
+                                .setCashOutType(1)
+                                .setOrderNo(pay.getOutBizNo())
+                                .setAliOrderNo(pay.getOrderId())
+                                .setIncomeStartTime(groupedByStoreId.get(storeId).get(0).getCreatedTime())
+                                .setIncomeEndTime(groupedByStoreId.get(storeId).get(groupedByStoreId.get(storeId).size() - 1).getCreatedTime())
+                                .setPaymentDate(new Date());
+                        storeCashOutRecordService.save(storeCashOutRecord);
+                        list.forEach(record -> {
+                            if (record.getStoreId().equals(storeId)) {
+                                record.setCashOutId(storeCashOutRecord.getId());
+                            }
+                        });
+                        //减少金额
+                        filteredUsers.setMoney(filteredUsers.getMoney() - money);
+                        storeUserService.updateById(filteredUsers);
+                    }
                 }
             }
         });
@@ -265,7 +268,7 @@ public class ScheduledTask {
     /**
      * 反向团购订单自动退款
      */
-    @Scheduled(cron = "0 * * * * ?")
+//    @Scheduled(cron = "0 * * * * ?")
     public void reverseGroupOrder() {
         LambdaQueryWrapper<LifeReverseGroupBuying> wrapper = new LambdaQueryWrapper<>();
         //状态, 0:待审核, 1:未通过, 2:已通过, 3:待接单, 4:未接单(已截止), 5:待使用, 6:已完成, 7:已退款
@@ -284,7 +287,7 @@ public class ScheduledTask {
                     LifeUser lifeUser = lifeUserService.getById(lifeUserOrder.getUserId());
                     LifeMessage lifeMessage = new LifeMessage();
                     lifeMessage.setSenderName("system");
-                    if (lifeUser != null){
+                    if (lifeUser != null) {
                         lifeMessage.setReceiverId("user_" + lifeUser.getUserPhone());
                         lifeMessage.setContent("你有一笔反向团购退款失败, 请联系管理员");
                         lifeMessage.setType("2");