diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index f5462169b..81b270201 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -16,7 +16,6 @@ import com.huifu.adapay.model.Refund; import com.jsowell.adapay.common.CreateAdaPaymentParam; import com.jsowell.common.constant.CacheConstants; 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; @@ -2141,22 +2140,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 微信支付 dto.setOrderBasicInfo(orderInfo); + Map weixinMap = adapayPayOrder(dto); // 从字典中获取使用汇付支付的站点 - List adapay_station = DictUtils.getDictCache("adapay_station"); - List stationIdList = Lists.newArrayList(); - if (CollectionUtils.isNotEmpty(adapay_station)) { - for (SysDictData sysDictData : adapay_station) { - stationIdList.add(sysDictData.getDictValue()); - } - } - Map weixinMap; - if (stationIdList.contains(orderInfo.getStationId())) { - logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); - weixinMap = adapayPayOrder(dto); - } else { - logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); - weixinMap = wechatPayOrder(dto); - } + // List adapay_station = DictUtils.getDictCache("adapay_station"); + // List stationIdList = Lists.newArrayList(); + // if (CollectionUtils.isNotEmpty(adapay_station)) { + // for (SysDictData sysDictData : adapay_station) { + // stationIdList.add(sysDictData.getDictValue()); + // } + // } + // if (stationIdList.contains(orderInfo.getStationId())) { + // logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); + // weixinMap = adapayPayOrder(dto); + // } else { + // logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); + // weixinMap = wechatPayOrder(dto); + // } // 返回微信支付参数 resultMap.put("weixinMap", weixinMap);