充值审核修复驳回仍加金币bug，金币明细筛选修复，充值明细未筛选驳回与未审核数据

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -47,7 +47,8 @@ public class AuditServiceImpl implements AuditService {
             updateOrder.setAuditStatus(2);
             updateOrder.setRejectReason(rejectReason);
             updateOrder.setAuditTime(new Date());
-
+            // 执行审核更新
+            auditMapper.updateOrder(updateOrder);
             if (order.getType()==2) {  //退款
                 //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单）
                 String consumeOrderCode = order.getOrderCode().replaceFirst("TK", "");
@@ -62,7 +63,6 @@ public class AuditServiceImpl implements AuditService {
         }else if (action==1) {    //通过
             updateOrder.setAuditStatus(1);
             updateOrder.setAuditTime(new Date());
-        }
             // 执行审核更新
             auditMapper.updateOrder(updateOrder);
             //判断是充值还是退款
@@ -111,6 +111,8 @@ public class AuditServiceImpl implements AuditService {
                 }
 
             }
+        }
+
         return true;
      }
     /*

src/main/resources/application.yml

@@ -4,9 +4,9 @@ spring:
       fail-on-unknown-properties: false
   datasource:
     mysql1:
-      jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai
-      username: hwgoldc
-      password: zB48T55wCsHC8KPz
+      jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgold?serverTimezone=Asia/Shanghai
+      username: hwgold
+      password: aDiw7MERSATdfGta
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql1HikariCP

src/main/resources/mapper/GoldDetailMapper.xml

@@ -13,6 +13,7 @@
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id
         <where>
+             ugr.audit_status IN (1,3)
             <if test="jwcode != null">
                 and ugr.jwcode = #{jwcode}
             </if>

src/main/resources/mapper/RechargeMapper.xml

@@ -24,7 +24,7 @@
         JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode
         JOIN admin a ON ugr.admin_id = a.id
         JOIN rate r ON ugr.rate_id = r.id
-        WHERE ugr.type = 0
+        WHERE ugr.type = 0 AND ugr.audit_status IN (1,3)
 
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
@@ -84,7 +84,7 @@
         JOIN admin a ON ugr.admin_id = a.id
         JOIN rate r ON ugr.rate_id = r.id
         <where>
-            ugr.type = 0
+            ugr.type = 0 AND ugr.audit_status IN (1,3)
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>

src/main/resources/mapper/RefundMapper.xml

@@ -23,7 +23,7 @@
              user_gold_record ugr ON u.jwcode = ugr.jwcode
                  JOIN
              admin a ON ugr.admin_id = a.id
-        WHERE ugr.type = 2
+        WHERE ugr.type = 2 AND ugr.audit_status IN (1,3)
         <trim prefix="ORDER BY" suffixOverrides=",">
             <choose>
                 <!-- 当指定排序字段时使用指定字段排序 -->
@@ -82,7 +82,7 @@
         JOIN
         admin a ON ugr.admin_id = a.id
         <where>
-            ugr.type = 2
+            ugr.type = 2 AND ugr.audit_status IN (1,3)
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>