Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!805

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);
     }