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

update huifu

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-16 14:01:34 +08:00
parent 41cb7dda4c
commit d80b84af58
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -116,7 +116,6 @@ public class PayController extends BaseController {
if (isLock) {
map = orderService.payOrder(dto);
}
// Map<String, Object> map = orderService.payOrder(dto);
response = new RestApiResponse<>(map);
} catch (BusinessException e) {
logger.warn("支付订单 warn param:{}", dto.toString(), e);

10
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
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())) { // 支付宝支付