diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 1161ff92d..b410b20c3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -116,7 +116,6 @@ public class PayController extends BaseController { if (isLock) { map = orderService.payOrder(dto); } - // Map map = orderService.payOrder(dto); response = new RestApiResponse<>(map); } catch (BusinessException e) { logger.warn("支付订单 warn param:{}", dto.toString(), e); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 4c91c08ef..4541f86d2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -157,6 +157,8 @@ public class OrderService { @Autowired private RedisCache redisCache; + private List 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 weixinMap = wechatPayOrder(dto); - // Map weixinMap = adapayPayOrder(dto); + Map 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())) { // 支付宝支付