错误提交恢复

admin/src/main/resources/application-prod.yml

@@ -92,19 +92,19 @@ spring:
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         db-admin:
-          url: jdbc:mysql://121.40.98.15:3306/charge_admin?serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/charge_admin?serverTimezone=Asia/Shanghai
           username: kym
           password: qYhQLZLP6e7paVmQN5foEwRYJ1yFNpwM
           driver-class-name: com.mysql.cj.jdbc.Driver
         db-miniapp:
-          url: jdbc:mysql://121.40.98.15:3306/charge_app?serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/charge_app?serverTimezone=Asia/Shanghai
           username: kym
           password: qYhQLZLP6e7paVmQN5foEwRYJ1yFNpwM
           driver-class-name: com.mysql.cj.jdbc.Driver
   data:
     redis:
       port: 6379
-      host: 121.40.98.15
+      host: 127.0.0.1
       password: OPYCJ3mJpaU4IsP7ZeIyaus6FtHjLYmhNDGteuRc1gIFCAm7wi
       database: 10
       lettuce:
@@ -120,7 +120,7 @@ spring:
       # 缓存过期时间：7天
       time-to-live: 604800
   rabbitmq:
-    host: 121.40.98.15
+    host: 127.0.0.1
     port: 5680
     username: kym
     password: vMRbZPfunLX8kDwfyy737y1Ahzfgr5ib
@@ -140,4 +140,4 @@ spring:
         batch-size: 100 #每次批量消费大小
 
 kym:
-  notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn
+  notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn

miniapp/src/main/resources/application-prod.yml

@@ -85,19 +85,19 @@ spring:
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         db-admin:
-          url: jdbc:mysql://121.40.98.15:3306/charge_admin?serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/charge_admin?serverTimezone=Asia/Shanghai
           username: kym
           password: qYhQLZLP6e7paVmQN5foEwRYJ1yFNpwM
           driver-class-name: com.mysql.cj.jdbc.Driver
         db-miniapp:
-          url: jdbc:mysql://121.40.98.15:3306/charge_app?serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/charge_app?serverTimezone=Asia/Shanghai
           username: kym
           password: qYhQLZLP6e7paVmQN5foEwRYJ1yFNpwM
           driver-class-name: com.mysql.cj.jdbc.Driver
   data:
     redis:
       port: 6379
-      host: 121.40.98.15
+      host: 127.0.0.1
       password: OPYCJ3mJpaU4IsP7ZeIyaus6FtHjLYmhNDGteuRc1gIFCAm7wi
       database: 10
       lettuce:
@@ -131,4 +131,4 @@ spring:
           multiplier: 2
 
 kym:
-  notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn
+  notify-email: zaizai@kuaiyuman.cn,skyline@kuaiyuman.cn

service/src/main/java/com/kym/service/miniapp/impl/NoDiscountHandle.java

@@ -1,6 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import com.kym.common.utils.CommUtil;
+import com.kym.entity.admin.RechargeRights;
 import com.kym.entity.miniapp.Account;
 import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.UserRechargeRights;
@@ -41,7 +42,9 @@ public class NoDiscountHandle implements DiscountService {
 
         // 没有用完就过期失效的充值权益
         var userRechargeRightsList = userRechargeRightsService.lambdaQuery()
+                // 筛选当前订单所在站点可以用的权益
                 .eq(UserRechargeRights::getUserId, chargeOrder.getUserId())
+                .eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_无效)
                 .gt(UserRechargeRights::getRightsBalance, 0)
                 .orderByAsc(UserRechargeRights::getEndTime)
                 .list();