Merge branch 'develop-debt' into test-user

* develop-debt:
  欠款扣除日志
  no message

kxs-common/kxs-common-core/src/main/resources/logback-spring.xml

@@ -81,7 +81,7 @@
 		</root>
 	</springProfile>
 	<springProfile name="prod">
-		<root level="ERROR">
+		<root level="INFO">
 			<appender-ref ref="console"/>
 			<appender-ref ref="debug"/>
 			<appender-ref ref="error"/>

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

@@ -20,6 +20,7 @@ import com.kxs.user.biz.mapper.old.KxsMainServerMapper;
 import com.kxs.user.biz.mapper.old.KxsOpServerMapper;
 import com.kxs.user.biz.service.KxsTotalDebtService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -31,6 +32,7 @@ import java.math.BigDecimal;
  * @since 2024-03-22 11:05:40
  */
 @Service("kxsTotalDebtService")
+@Slf4j
 @RequiredArgsConstructor
 public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, KxsTotalDebt> implements KxsTotalDebtService {
 
@@ -112,7 +114,6 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
             kxsPartnerAmountLog.setRemark("预借款项还款");
             kxsPartnerAmountLog.setVariationType(UserVariationTypeEnum.PARTNER_WITHDRAW_BALANCE.getType());
             kxsOpServerMapper.addAmountLog(kxsPartner, kxsPartnerAmountLog);
-
             //扣除成功 增加欠款日志
             BigDecimal afterAmount = NumberUtil.sub(kxsTotalDebt.getTotalDebt(),partnerDeductAmount);
             //添加日志
@@ -128,6 +129,7 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
 
             kxsTotalDebt.setTotalDebt(afterAmount);
             baseMapper.updateById(kxsTotalDebt);
+            log.info("扣除合伙人:{}可提现额度:{}", kxsPartner.getUserId(), partnerDeductAmount);
 
         }
     }
@@ -179,6 +181,7 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
 
             kxsTotalDebt.setTotalDebt(afterAmount);
             baseMapper.updateById(kxsTotalDebt);
+            log.info("扣除盟主:{}可提现额度:{}", kxsTotalDebt.getUserId(), leaderDeductAmount);
         }
     }
 

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

@@ -59,7 +59,7 @@ public class KxsUserTaskJob {
      * 1.扫创客合伙人可提现额度，若有合伙人可提现额度，则扣除可提现额度，最大扣除金额=欠款总金额，扣除后减少欠款总金额，同时在前端增加扣除记录，备注为「预借款项还款」
      * 2.扫创客盟主可提现余额，若有盟主可提现余额，则扣除可提现余额，最大扣除金额=欠款总金额，扣除后减少欠款总金额，同时在前端增加扣除记录，备注为「预借款项还款」
      */
-    @Inner(value = false)
+    @Inner
     @GetMapping("/userTotalDebtSub")
     public void userTotalDebtSub(){
         //查询所有欠款大于0的创客