czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付相关

Browse Source
This commit is contained in:
lyf
2023-02-06 19:13:31 +08:00
parent 177b966237
commit 55cabfa8af
3 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
View File

@@ -1032,15 +1032,16 @@ public class MerchantController {
}
MerchantBaseInfo baseInfo = queryMerchantBaseInfoList.get(0);
// 全局电子围栏和单商户电子围栏判定
if (!commonSwitchService.allowEcdemicPay() && !storeInfo.allowEcdemicPay()) {
// 不允许异地支付的时候需要校验ip和商户所在城市
try {
merchantService.checkPayLocation(request, baseInfo);
} catch (PayRiskException e) {
model.addAttribute("error", e.getMessage());
return view;
}
}
//TODO 先暂时可以异地支付
// if (!commonSwitchService.allowEcdemicPay() && !storeInfo.allowEcdemicPay()) {
// // 不允许异地支付的时候需要校验ip和商户所在城市
// try {
// merchantService.checkPayLocation(request, baseInfo);
// } catch (PayRiskException e) {
// model.addAttribute("error", e.getMessage());
// return view;
// }
// }
model.addAttribute("merchantCode", baseInfo.getMerchantCode());
model.addAttribute("userAppId", userApp.getUserId());
model.addAttribute("storeId", storeInfo.getStoreId());