update huifu

This commit is contained in:
2023-05-16 14:01:34 +08:00
parent 41cb7dda4c
commit d80b84af58
2 changed files with 8 additions and 3 deletions

View File

@@ -157,6 +157,8 @@ public class OrderService {
@Autowired
private RedisCache redisCache;
private List<String> stationIdList = Lists.newArrayList("1", "2");
/**
* 生成订单
*
@@ -197,8 +199,12 @@ public class OrderService {
} else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
// 微信支付
dto.setOrderBasicInfo(orderInfo);
Map<String, Object> weixinMap = wechatPayOrder(dto);
// Map<String, Object> weixinMap = adapayPayOrder(dto);
Map<String, Object> weixinMap = null;
if (stationIdList.contains("all") || stationIdList.contains(orderInfo.getStationId())) {
weixinMap = adapayPayOrder(dto);
} else {
weixinMap = wechatPayOrder(dto);
}
// 返回微信支付参数
resultMap.put("weixinMap", weixinMap);
} else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue())) { // 支付宝支付