This commit is contained in:
2023-07-10 10:07:59 +08:00
parent 44e8da28e4
commit 5f9586e7e2

View File

@@ -16,7 +16,6 @@ import com.huifu.adapay.model.Refund;
import com.jsowell.adapay.common.CreateAdaPaymentParam; import com.jsowell.adapay.common.CreateAdaPaymentParam;
import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants; 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.vo.AuthorizedDeptVO;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
@@ -2141,22 +2140,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 微信支付 // 微信支付
dto.setOrderBasicInfo(orderInfo); dto.setOrderBasicInfo(orderInfo);
Map<String, Object> weixinMap = adapayPayOrder(dto);
// 从字典中获取使用汇付支付的站点 // 从字典中获取使用汇付支付的站点
List<SysDictData> adapay_station = DictUtils.getDictCache("adapay_station"); // List<SysDictData> adapay_station = DictUtils.getDictCache("adapay_station");
List<String> stationIdList = Lists.newArrayList(); // List<String> stationIdList = Lists.newArrayList();
if (CollectionUtils.isNotEmpty(adapay_station)) { // if (CollectionUtils.isNotEmpty(adapay_station)) {
for (SysDictData sysDictData : adapay_station) { // for (SysDictData sysDictData : adapay_station) {
stationIdList.add(sysDictData.getDictValue()); // stationIdList.add(sysDictData.getDictValue());
} // }
} // }
Map<String, Object> weixinMap; // if (stationIdList.contains(orderInfo.getStationId())) {
if (stationIdList.contains(orderInfo.getStationId())) { // logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId());
logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); // weixinMap = adapayPayOrder(dto);
weixinMap = adapayPayOrder(dto); // } else {
} else { // logger.info("该站点:{}使用微信支付", orderInfo.getStationId());
logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); // weixinMap = wechatPayOrder(dto);
weixinMap = wechatPayOrder(dto); // }
}
// 返回微信支付参数 // 返回微信支付参数
resultMap.put("weixinMap", weixinMap); resultMap.put("weixinMap", weixinMap);