提交代码

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

@@ -1289,6 +1289,10 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
 
     @Override
     public HighChildOrder oilCard(HighOrder order, CreateOrderChildModel createOrderChildModel) {
+        SecConfig type = secConfigService.findByCodeType("OIL_CARD_RECHARGE");
+        if (type != null && type.getCodeValue().equals("false")) {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法充值！");
+        }
         // 查询油卡
         HighOilCard card = oilCardService.getOilCardByCardNo(createOrderChildModel.getGoodsId().toString());
         if (card == null) {

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

@@ -96,11 +96,6 @@ public class OrderPayBeforeServiceImpl implements OrderPayBeforeService {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
             }
 
-        } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE16.getNumber())) {
-            SecConfig type = secConfigService.findByCodeType("OIL_CARD_RECHARGE");
-            if (type != null && type.getCodeValue().equals("false")) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时进行无法充值！");
-            }
         }
     }
 }