fix 微信支付回调 lettuce日志级别修改

admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -67,7 +67,8 @@ public class CustomController {
     @SysLog("处理用户微信退款")
     @GetMapping("/customWxRefund/{refundLogId}")
     public R<?> customWxRefund(@PathVariable("refundLogId") long refundLogId) {
-        return R.success(wxPayService.wxRefund(refundLogId));
+        wxPayService.wxRefund(refundLogId);
+        return R.success();
     }
 
 

admin/src/main/resources/logback-spring.xml

@@ -30,6 +30,7 @@
     <logger name="io.netty" level="info"/>
     <logger name="springfox.documentation" level="warn"/>
     <logger name="org.apache.http" level="info"/>
+    <logger name="io.lettuce" level="info"/>
     <root level="debug">
         <appender-ref ref="console"/>
         <appender-ref ref="file"/>

miniapp/src/main/resources/generatorConfig.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-<generatorConfiguration>
-    <!--数据库驱动-->
-    <classPathEntry
-            location="D:\Apache\repository\mysql\mysql-connector-java\8.0.29\mysql-connector-java-8.0.29.jar"/>
-    <context id="mysql" targetRuntime="MyBatis3">
-        <!--是否忽略注释的生成 true -->
-        <commentGenerator>
-            <!-- 这个元素用来去除指定生成的注释中是否包含生成的日期 false:表示包含 -->
-            <!-- 如果生成日期，会造成即使修改一个字段，整个实体类所有属性都会发生变化，不利于版本控制，所以
-            设置为true -->
-            <property name="suppressDate" value="true"/>
-            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
-            <property name="suppressAllComments" value="true"/>
-        </commentGenerator>
-        <!--数据库链接地址账号密码-->
-        <!--数据库链接URL，用户名、密码 -->
-        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
-                        connectionURL="jdbc:mysql://localhost:3306/charge_admin"
-                        userId="root"
-                        password="root">
-        </jdbcConnection>
-        <!--生成Model类存放位置 entity-->
-        <javaModelGenerator targetPackage="com.kym.charge.entity" targetProject="./src/main/java">
-            <!--是否合并-->
-            <property name="enableSubPackages" value="true"/>
-            <!--去除空格-->
-            <property name="trimStrings" value="true"/>
-        </javaModelGenerator>
-        <!--生成映射文件存放位置-->
-        <sqlMapGenerator targetPackage="mappers" targetProject="./src/main/resources">
-            <!--是否合并-->
-            <property name="enableSubPackages" value="true"/>
-        </sqlMapGenerator>
-        <!--生成Dao接口存放位置-->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.kym.charge.mapper" targetProject="./src/main/java">
-            <!--是否合并-->
-            <property name="enableSubPackages" value="true"/>
-        </javaClientGenerator>
-        <!--生成对应表及类名-->
-        <table tableName="t_user" domainObjectName="User"></table>
-        <table tableName="t_account" domainObjectName="Account"></table>
-        <table tableName="t_charge_order" domainObjectName="ChargeOrder"></table>
-        <table tableName="t_station" domainObjectName="Station"></table>
-    </context>
-</generatorConfiguration>

miniapp/src/main/resources/logback-spring.xml

@@ -29,6 +29,7 @@
     <logger name="io.netty" level="info"/>
     <logger name="springfox.documentation" level="warn"/>
     <logger name="org.apache.http" level="info"/>
+    <logger name="io.lettuce" level="info"/>
     <root level="debug">
         <appender-ref ref="console"/>
         <appender-ref ref="file"/>

service/src/main/java/com/kym/service/wechat/WxPayService.java

@@ -16,7 +16,7 @@ import java.io.IOException;
 public interface WxPayService {
     void applyWxRefund();
 
-    Refund wxRefund(long refundLogId);
+    void wxRefund(long refundLogId);
 
     Refund queryByOutRefundNo(String outRefundNo);
 

service/src/main/java/com/kym/service/wechat/impl/WxPayServiceImpl.java

@@ -387,7 +387,7 @@ public class WxPayServiceImpl implements WxPayService {
      */
     @DS("db-miniapp")
     @Override
-    public Refund wxRefund(long refundLogId) {
+    public void wxRefund(long refundLogId) {
         // 通过退款申请id获取退款申请记录
         var refundLog = refundLogService.getById(refundLogId);
 
@@ -416,7 +416,13 @@ public class WxPayServiceImpl implements WxPayService {
         amount.setTotal((long) refundLog.getTotal());
         amount.setCurrency(refundLog.getCurrency());
         request.setAmount(amount);
-        return refundService.create(request);
+        var refund = refundService.create(request);
+
+        refundLog.setChannel(refund.getChannel().name());
+        refundLog.setFundsAccount(refund.getFundsAccount().name());
+        refundLog.setCurrency(refund.getAmount().getCurrency());
+        refundLogService.updateById(refundLog);
+
     }
 
     /**
@@ -455,14 +461,11 @@ public class WxPayServiceImpl implements WxPayService {
             refundLog
                     .setRefundId(refundNotification.getRefundId())
                     .setTransactionId(refundNotification.getTransactionId())
-                    .setChannel(refundNotification.getChannel().name())
                     .setUserReceivedAccount(refundNotification.getUserReceivedAccount())
                     .setSuccessTime(successTime)
                     .setStatus(refundNotification.getRefundStatus().name())
-                    .setFundsAccount(refundNotification.getFundsAccount().name())
                     .setTotal(refundNotification.getAmount().getTotal().intValue())
-                    .setRefund(refundNotification.getAmount().getRefund().intValue())
-                    .setCurrency(refundNotification.getAmount().getCurrency());
+                    .setRefund(refundNotification.getAmount().getRefund().intValue());
             refundLog.setCreateTime(LocalDateTimeUtil.of(DateUtil.parse(refundNotification.getCreateTime())));
             refundLogService.updateById(refundLog);