余额支付订单

This commit is contained in:
2023-11-28 14:27:42 +08:00
parent 532f4489fe
commit cdc037690b
3 changed files with 39 additions and 39 deletions

View File

@@ -2364,6 +2364,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(dto.getPileSn());
PileStationWhitelist pileStationWhitelist = pileStationWhitelistService.queryWhitelistByMemberId(String.valueOf(pileBasicInfo.getStationId()), dto.getMemberId());
// 运营商id
String merchantId = pileBasicInfo.getMerchantId() + "";
if (platformTesterVO != null && StringUtils.equals(Constants.ONE, platformTesterVO.getStatus())) {
// 是平台测试员
accountBalance = new BigDecimal("500");
@@ -2375,7 +2378,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
payMode = OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue();
} else {
// 通过memberId获取账户余额
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId(), pileBasicInfo.getMerchantId() + "");
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId(), merchantId);
if (memberVO == null) {
throw new BusinessException(ReturnCodeEnum.CODE_GET_MEMBER_ACCOUNT_AMOUNT_ERROR);
}
@@ -2433,7 +2436,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// payOrderDTO.setLockValue();
// payOrderDTO.setOrderBasicInfo(basicInfo);
payOrder(payOrderDTO);
// payOrder(payOrderDTO);
String mode = pileMerchantInfoService.getDelayModeByMerchantId(merchantId);
// 获取处理逻辑
AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(mode);
orderLogic.payOrder(payOrderDTO);
// 推送小程序启动充电消息
// 通过memberId查询openId