提交代码

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -147,9 +147,11 @@ public class OrderPayController {
                 if (store == null) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站");
                 }
+                if (store.getPrestoreType().equals(1)) {
                     if (order.getTotalPrice().compareTo(gasService.getMerPriceByMerId(store.getMerchantId())) == 1) {
                         throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法进行支付，请联系平台客服");
                     }
+                }
 
                 if (store.getSourceType().equals(MerchantStoreSourceType.type1.getNumber())) {
                     // 查询支付配置

hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java

@@ -43,9 +43,11 @@ public class OrderPayBeforeServiceImpl implements OrderPayBeforeService {
             if (store == null) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站");
             }
+            if (store.getPrestoreType().equals(1)) {
                 if (order.getTotalPrice().compareTo(gasService.getMerPriceByMerId(store.getMerchantId())) == 1) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法进行支付，请联系平台客服");
                 }
+            }
 
             if (store.getSourceType().equals(MerchantStoreSourceType.type1.getNumber())) {
                 // 查询支付配置