autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-27 14:35:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-22 12:32:22 +08:00
parent 925531cf2c
commit bba7c16e35
7 changed files with 173 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2993,37 +2993,37 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
* @param dto
* @return
*/
@Override
public Map<String, Object> payOrder(PayOrderDTO dto) {
OrderBasicInfo orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
if (orderInfo == null) {
throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL);
}
if (!StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.unpaid.getValue())) {
// 订单已支付
throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR);
}
Map<String, Object> resultMap = Maps.newHashMap();
if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) {
// 余额支付
// balancePayOrder(dto);
balancePayOrderV2(dto);
} else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
// 2023-07-11 全部改为汇付支付
dto.setGoodsTitle("充电费用");
dto.setGoodsDesc("充电桩预付款金额");
dto.setType(ScenarioEnum.ORDER.getValue());
Map<String, Object> weixinMap = adapayService.createPayment(dto);
// 返回微信支付参数
resultMap.put("weixinMap", weixinMap);
} else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付
// 白名单支付可以直接调支付回调方法
dto.setPayAmount(Constants.whitelistDefaultAmount);
whiteListPayOrder(dto);
}
return resultMap;
}
// @Override
// public Map<String, Object> payOrder(PayOrderDTO dto) {
// OrderBasicInfo orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
// if (orderInfo == null) {
// throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL);
// }
// if (!StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.unpaid.getValue())) {
// // 订单已支付
// throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR);
// }
// Map<String, Object> resultMap = Maps.newHashMap();
// if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) {
// // 余额支付
// // balancePayOrder(dto);
// balancePayOrderV2(dto);
// } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
// // 2023-07-11 全部改为汇付支付
// dto.setGoodsTitle("充电费用");
// dto.setGoodsDesc("充电桩预付款金额");
// dto.setType(ScenarioEnum.ORDER.getValue());
// Map<String, Object> weixinMap = adapayService.createPayment(dto);
//
// // 返回微信支付参数
// resultMap.put("weixinMap", weixinMap);
// } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付
// // 白名单支付可以直接调支付回调方法
// dto.setPayAmount(Constants.whitelistDefaultAmount);
// whiteListPayOrder(dto);
// }
// return resultMap;
// }
/**
* 白名单支付订单逻辑