Merge branch 'develop-debt' into test-user

* develop-debt:
  欠款分开操作
  no message

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsTotalDebtServiceImpl.java

@@ -87,6 +87,11 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
     @Override
     @DSTransactional(rollbackFor = Exception.class)
     public void deductPartnerAmount(KxsTotalDebt kxsTotalDebt) {
+        //执行之前先查询一次
+        KxsTotalDebt totalDebt = baseMapper.selectById(kxsTotalDebt.getId());
+        if(totalDebt.getTotalDebt().compareTo(BigDecimal.ZERO) <= 0){
+            return;
+        }
         //查询该创客合伙人/盟主是否有客提现余额，如果大于0则扣除
         KxsPartner kxsPartner = kxsPartnerMapper.selectOne(Wrappers.<KxsPartner>lambdaQuery().eq(KxsPartner::getUserId, kxsTotalDebt.getUserId()));
         if(kxsPartner == null){
@@ -137,6 +142,11 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
     @Override
     @DSTransactional(rollbackFor = Exception.class)
     public void deductLeaderAmount(KxsTotalDebt kxsTotalDebt) {
+
+        KxsTotalDebt totalDebt = baseMapper.selectById(kxsTotalDebt.getId());
+        if(totalDebt.getTotalDebt().compareTo(BigDecimal.ZERO) <= 0){
+            return;
+        }
         //查询该创客合伙人/盟主是否有客提现余额，如果大于0则扣除
         KxsLeader kxsLeader = kxsLeaderMapper.selectOne(Wrappers.<KxsLeader>lambdaQuery().eq(KxsLeader::getUserId, kxsTotalDebt.getUserId()));
         if(kxsLeader == null){

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/task/KxsUserTaskJob.java

@@ -43,6 +43,8 @@ public class KxsUserTaskJob {
 
     private final KxsTotalDebtMapper kxsTotalDebtMapper;
 
+    private final static String PREFIX_TABLE_NAME = "kxs_user_amount_log_";
+
     /**
      * 自动表创建任务
      * 每个月15号建立下个月的收支日志表
@@ -51,7 +53,7 @@ public class KxsUserTaskJob {
     @GetMapping("/automaticTableCreationTasks")
     public void automaticTableCreationTasks() {
         String thisMoth = LocalDateTimeUtil.format(LocalDate.now().plusMonths(1L), DatePattern.SIMPLE_MONTH_PATTERN);
-        kxsUserAmountLogMapper.automaticTableCreationTasks("kxs_user_amount_log_" +thisMoth);
+        kxsUserAmountLogMapper.automaticTableCreationTasks(PREFIX_TABLE_NAME + thisMoth);
     }
 
     /**