预借款还款扣除日志修改所属表

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

@@ -63,14 +63,60 @@
 		</filter>
 	</appender>
 
+	<!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
+	<shutdownHook class="ch.qos.logback.core.hook.DefaultShutdownHook"/>
+	<!-- 可用来获取StatusManager中的状态 -->
+	<statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener"/>
+
+	<!-- 解决debug模式下循环发送的问题 -->
+	<logger name="org.apache.http.impl.conn.Wire" level="WARN" />
+
+	<!-- 引入sls日志 -->
+	<appender name="aliyun" class="com.aliyun.openservices.log.logback.LoghubAppender">
+		<!-- Configure account and network  -->
+		<endpoint>cn-shenzhen.log.aliyuncs.com</endpoint>
+		<!-- 填写sls key密钥 -->
+		<accessKeyId>**********</accessKeyId>
+		<accessKeySecret>*****************</accessKeySecret>
+
+		<project>tajia-log</project>
+		<!--logStore名称 -->
+		<logStore>tajia-api</logStore>
+
+		<!-- Optional parameters -->
+<!--		#单个 producer 实例能缓存的日志大小上限，默认为 100MB。-->
+		<totalSizeInBytes>104857600</totalSizeInBytes>
+		<maxBlockMs>0</maxBlockMs>
+<!--		执行日志发送任务的线程池大小，默认为可用处理器个数。-->
+		<ioThreadCount>8</ioThreadCount>
+		<batchSizeThresholdInBytes>524288</batchSizeThresholdInBytes>
+		<batchCountThreshold>4096</batchCountThreshold>
+		<lingerMs>2000</lingerMs>
+		<retries>10</retries>
+		<baseRetryBackoffMs>100</baseRetryBackoffMs>
+		<maxRetryBackoffMs>50000</maxRetryBackoffMs>
+
+		<!-- 可选项 通过配置 encoder 的 pattern 自定义 log 的格式 -->
+		<encoder>
+			<pattern>%d %-5level [%thread] %X{traceId} %logger{0}: %msg</pattern>-->
+			<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %highlight([%-5level] [%thread] %logger{50} - %msg%n)</pattern>
+			<charset>UTF-8</charset>
+		</encoder>
+
+		<!--  Optional parameters -->
+		<timeFormat>yyyy-MM-dd'T'HH:mmZ</timeFormat>
+		<!--  Optional parameters -->
+		<timeZone>UTC</timeZone>
+		<mdcFields>
+			TraceId,#####
+		</mdcFields>
+	</appender>
 
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
 
 	<springProfile name="dev">
 		<root level="INFO">
 			<appender-ref ref="console"/>
-			<appender-ref ref="debug"/>
-			<appender-ref ref="error"/>
 		</root>
 	</springProfile>
 	<springProfile name="test">
@@ -85,6 +131,7 @@
 			<appender-ref ref="console"/>
 			<appender-ref ref="debug"/>
 			<appender-ref ref="error"/>
+			<appender-ref ref="aliyun" />
 		</root>
 	</springProfile>
 </configuration>

kxs-common/kxs-common-log/pom.xml

@@ -48,6 +48,12 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-core</artifactId>
         </dependency>
+        <!--阿里云SLS日志包-->
+        <dependency>
+            <groupId>com.aliyun.openservices</groupId>
+            <artifactId>aliyun-log-logback-appender</artifactId>
+            <version>0.1.18</version>
+        </dependency>
     </dependencies>
 
 </project>

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeaderAmountLog.java

@@ -29,7 +29,6 @@ import lombok.EqualsAndHashCode;
  * //  盟主储蓄金：剩余盟主储蓄金
  * //  可提现余额：+金额
  *
- * ChangeType //操作类型(1 增加 2 减少)
  * ChangeAmt //变动金额
  * AfterAmt //变动后余额
  * Remark //标题
@@ -128,6 +127,13 @@ public class KxsLeaderAmountLog extends Model<KxsLeaderAmountLog> implements Ser
     private Integer variationType;
 
 
+    /**
+     * 收支类型 对应change_type表
+     */
+    @Schema(description = "金额类型")
+    private Integer changeType;
+
+
     /**
      * 原因
      */

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

@@ -119,6 +119,7 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
             kxsPartnerAmountLog.setKind(KindTypeEnum.SUB.getType());
             kxsPartnerAmountLog.setRemark("预借款项还款");
             kxsPartnerAmountLog.setVariationType(UserVariationTypeEnum.PARTNER_WITHDRAW_BALANCE.getType());
+            //添加到老库
             kxsOpServerMapper.addAmountLog(kxsPartner, kxsPartnerAmountLog);
             //扣除成功 增加欠款日志
             BigDecimal afterAmount = NumberUtil.sub(kxsTotalDebt.getTotalDebt(),partnerDeductAmount);
@@ -174,6 +175,8 @@ public class KxsTotalDebtServiceImpl extends ServiceImpl<KxsTotalDebtMapper, Kxs
             kxsLeaderAmountLog.setAmount(leaderDeductAmount);
             kxsLeaderAmountLog.setKind(KindTypeEnum.SUB.getType());
             kxsLeaderAmountLog.setVariationType(UserVariationTypeEnum.LEADER_WITHDRAW_BALANCE.getType());
+            kxsLeaderAmountLog.setChangeType(342);
+            //添加到老库
             kxsMainServerMapper.addAmountLog(kxsLeaderAmountLog);
 
             //扣除盟主余额成功

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsLeaderAmountLogMapper.xml

@@ -12,6 +12,7 @@
         <result column="before_amount" property="beforeAmount" />
         <result column="after_amount" property="afterAmount" />
         <result column="amount" property="amount" />
+        <result column="change_type" property="changeType" />
         <result column="variation_type" property="variationType" />
         <result column="variation_cause" property="variationCause" />
         <result column="kind" property="kind" />

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsMainMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.kxs.user.biz.mapper.old.KxsMainServerMapper">
 
     <insert id="addAmountLog">
-        insert into LeaderReserveRecord (UserId, ChangeType, Remark, AfterAmt, BeforeAmt, ChangeAmt, sort, TradeDate, TradeMonth, CreateDate)
-        values (#{userId}, 1, #{remark}, #{afterAmount},#{beforeAmount},#{amount}, #{variationType}, DATE_FORMAT(NOW(), '%Y%m%d'), DATE_FORMAT(NOW(), '%Y%m'), NOW())
+        insert into LeaderAccountRecord (UserId, ChangeType, SeoDescription, AfterBalanceAmount, BeforeBalanceAmount, ChangeAmount, CreateDate)
+        values (#{userId}, #{changeType}, #{remark}, #{afterAmount},#{beforeAmount},#{amount}, NOW())
     </insert>
 
     <update id="deductMakerUseAmount">