Merge branch 'online' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -305,7 +305,7 @@ public class UserOrderController extends BaseController {
         order.setTenantId(student.getTenantId());
 
         if (orderReq.getPaymentCashAmount().compareTo(new BigDecimal(10000000))>0) {
-            throw new BizException("下单金额不能超出10000000");
+            throw new BizException("支付失败，下单金额超过最高上限");
         }
 
         // 新增数据

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/UserOrderController.java

@@ -85,6 +85,9 @@ public class UserOrderController {
         if (Objects.isNull(tenantStaff)) {
             throw BizException.from("用户信息不存在");
         }
+        if (orderReq.getPaymentCashAmount().compareTo(new BigDecimal(10000000))>0) {
+            throw new com.yonge.toolset.base.exception.BizException("支付失败，下单金额超过最高上限");
+        }
 
 
         if (orderReq.getPaymentCashAmount().compareTo(new BigDecimal(10000000))>0) {