skyline 2 жил өмнө
parent
commit
8d5096257c

+ 4 - 2
service/src/main/java/com/kym/service/admin/impl/ActivityServiceImpl.java

@@ -168,11 +168,11 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     public void asyncHandleRechargeActivity(long userId, int rechargeAmount){
         log.info("RechargeActivityTask run....");
         // 进行中的充值权益活动
+        // 手动切换数据源
+        DynamicDataSourceContextHolder.push("db-admin");
         var activity = lambdaQuery().eq(Activity::getDiscountType, DISCOUNT_TYPE_服务费折扣权益).eq(Activity::getStatus, Activity.STATUS_进行中).one();
         // 充值金额,匹配到到具体的充值权益,生成用户权益
         if (activity != null) {
-            // 手动切换数据源
-            DynamicDataSourceContextHolder.push("db-admin");
             var rechargeRights = rechargeRightsService.lambdaQuery().eq(RechargeRights::getActivityId, activity.getId())
                     .le(RechargeRights::getAmountMin, rechargeAmount)
                     .ge(RechargeRights::getAmountMax, rechargeAmount) // 最后一档最大值设置成10000
@@ -188,6 +188,8 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
                 userRechargeRightsService.save(userRechargeRights.setStartTime(LocalDateTime.now()).setEndTime(endTime));
                 DynamicDataSourceContextHolder.poll();
             }
+        }else {
+            DynamicDataSourceContextHolder.poll();
         }
         log.info("RechargeActivityTask run end....");
     }