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 31b1e5756..4595ba528 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -17,6 +17,7 @@ import com.huifu.adapay.core.util.AdapaySign; import com.huifu.adapay.model.Payment; import com.jsowell.adapay.common.CreateAdaPaymentParam; import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.domain.entity.SysDictData; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.common.core.domain.ykc.TransactionRecordsData; @@ -26,10 +27,7 @@ import com.jsowell.common.enums.InvoiceRecordEnum; import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.AdapayUtil; -import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.SecurityUtils; -import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.*; import com.jsowell.common.util.bean.BeanUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.*; @@ -166,7 +164,22 @@ public class OrderService { } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付 dto.setOrderBasicInfo(orderInfo); - Map weixinMap = wechatPayOrder(dto); + + // 从字典中获取使用汇付支付的站点 + List adapay_station = DictUtils.getDictCache("adapay_station"); + List stationIdList = Lists.newArrayList(); + for (SysDictData sysDictData : adapay_station) { + stationIdList.add(sysDictData.getDictValue()); + } + Map weixinMap; + if (stationIdList.contains(orderInfo.getStationId())) { + log.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); + weixinMap = adapayPayOrder(dto); + } else { + log.info("该站点:{}使用微信支付", orderInfo.getStationId()); + weixinMap = wechatPayOrder(dto); + } + // 返回微信支付参数 resultMap.put("weixinMap", weixinMap); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue())) { // 支付宝支付