|
|
|
@ -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()); |
|
|
|
|