From 4143f7ae47ccc03882bf6c2f206a8526c2a475f5 Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Mon, 17 Feb 2025 11:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/OrderCreateService.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java index 793e408..dfde899 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java @@ -9,6 +9,7 @@ import com.hfkj.model.GasPayPriceModel; import com.hfkj.model.order.OrderChildModel; import com.hfkj.service.agent.BsAgentMerAccountService; import com.hfkj.service.discount.BsDiscountUseMerService; +import com.hfkj.service.merchant.BsMerchantPayConfigService; import com.hfkj.service.merchant.BsMerchantService; import com.hfkj.service.agent.BsAgentMerService; import com.hfkj.service.gas.BsGasClassGroupTaskService; @@ -58,7 +59,10 @@ public class OrderCreateService { private BsAgentMerService agentMerService; @Resource private BsGasStaffService gasStaffService; - + @Resource + private BsMerchantPayConfigService merPayConfigService; + @Resource + private BsGasChannelConfigService gasChannelConfigService; /** * 加油业务 * @param order 订单 @@ -101,6 +105,24 @@ public class OrderCreateService { if (!merchant.getStatus().equals(MerchantStatusEnum.status1.getNumber())) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前油站暂停交易"); } + if (merchant.getSourceType().equals(MerchantSourceTypeEnum.type1.getNumber())) { + // 查询平台 + BsMerchantPayConfig merPay = merPayConfigService.getConfig(merchant.getMerNo()); + if (merPay == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户未配置支付"); + } + + } else if (merchant.getSourceType().equals(MerchantSourceTypeEnum.type2.getNumber()) + || merchant.getSourceType().equals(MerchantSourceTypeEnum.type3.getNumber())) { + // 查询渠道支付配置 + BsGasChannelConfig payConfig = gasChannelConfigService.getDetail(MerchantSourceTypeEnum.getDataByType(merchant.getSourceType())); + if (payConfig == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户未配置支付"); + } + if (payConfig.getTradeStatus().equals(false)) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "油站维护中暂停交易!"); + } + } BsGasOrder gasOrder = new BsGasOrder(); gasOrder.setAbnormal(false); gasOrder.setMerNo(merchant.getMerNo());