Merge remote-tracking branch 'origin/dev' into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -288,6 +288,10 @@ public class UserDeliverOrderController extends BaseApiController {
     // 清除缓存的订单
     redisCache.deleteObject(RedisKey.build(RedisKey.USER_DELIVER_ORDER_KEY, userId));
 
+    /*if (orderSettleVO.getPayAmt() > 0) {
+      return AjaxResult.error("支付系统升级中，请稍后再试");
+    }*/
+
     return AjaxResult.success(jsonObject);
   }
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -182,6 +182,9 @@ public class UserTicketOrderController extends BaseApiController {
         }
         // 清除缓存的订单
         redisCache.deleteObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId));
+        /*if (orderSettleVO.getPayAmt() > 0) {
+            return AjaxResult.error("支付系统升级中，请稍后再试");
+        }*/
 
         return AjaxResult.success(jsonObject);
     }

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

@@ -151,10 +151,8 @@ pay:
   notifyUrl: https://www.quanshu123.com
   #callbackUrl: https://api.quanshu123.com/service/notify/payCallback
   baseUrl: https://jlpays.kakapaypay.com
-  #user-shopNo: 1646882813774
-  #user-sign: 614140724fb74085be8aef8bebc538ed
-  user-shopNo: 1657242588900
-  user-sign: e39069383c6944a18abc0b03a4ad0217
+  user-shopNo: 1646882813774
+  user-sign: 614140724fb74085be8aef8bebc538ed
   channel-shopNo: 1647504328218
   channel-sign: 0e0c00555fee4549b1a88af4d988415b