diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java index 900fa2e..abc160e 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java @@ -12,7 +12,9 @@ import cn.pluss.platform.merchant.MerchantBaseInfoService; import cn.pluss.platform.merchantImage.MerchantImageService; import cn.pluss.platform.merchantStore.MerchantStoreService; import cn.pluss.platform.userApp.UserAppService; +import cn.pluss.platform.util.ParametersUtil; import cn.pluss.platform.util.StringUtil; +import cn.pluss.platform.vo.StoreInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -142,4 +144,21 @@ public class MerchantStoreController { Map certInfo = merchantStoreService.getCertInfo(userApp.getUserId() + ""); return ResultGenerator.genSuccessResult(certInfo); } + + /** + * 查询详情 + */ + @GetMapping("/showMerchantStoreReceipt") + @ResponseBody + public Result showMerchantStoreReceipt(Integer userId, Integer channel) { + Map result = new HashMap<>(3); + if (userId != null && userId != 0) { + StoreInfoVO queryStoreInfoVO = merchantStoreService.showMerchantStoreReceipt(userId); + String url = ParametersUtil.domain + "/wap/merchant/authPay?userAppId=" + queryStoreInfoVO.getUserId(); + result.put("url", url); + result.put("storeName", queryStoreInfoVO.getStoreName()); + return ResultGenerator.genSuccessResult(result); + } + return ResultGenerator.genFailResult("获取失败"); + } } diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml index 023100a..4726316 100644 --- a/pluss-api-page/src/main/resources/application-dev.yml +++ b/pluss-api-page/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ spring: driver-class-name: com.mysql.jdbc.Driver parameter: ### 这个根据自己的情况配置 - domain: http://60.205.224.68 + domain: http://wxgzh.sxczgkj.cn swagger: ### 生产环境不允许访问swagger diff --git a/pluss-api-page/src/main/resources/application-test.yml b/pluss-api-page/src/main/resources/application-test.yml index 84b5a60..2260b68 100644 --- a/pluss-api-page/src/main/resources/application-test.yml +++ b/pluss-api-page/src/main/resources/application-test.yml @@ -7,7 +7,7 @@ spring: driver-class-name: com.mysql.jdbc.Driver parameter: - domain: http://60.205.224.68 + domain: http://wxgzh.sxczgkj.cn swagger: ### 生产环境不允许访问swagger diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml index a76a8b9..b6128a1 100644 --- a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml +++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml @@ -4,18 +4,33 @@ + + + + + + + + + + + + + + diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java index cf87f54..cf41c35 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java @@ -282,7 +282,6 @@ public class AliyunServiceImpl implements AliyunService { throw new MsgException("银行卡认证失败"); } - JSONObject jsonObject = JSON.parseObject(String.valueOf(verifyBankElementResponse.getBody())); if (!"200".equals(verifyBankElementResponse.getBody().getCode())) { if ("403".equals(verifyBankElementResponse.getBody().getCode())) { throw new MsgException("银行卡认证接口已欠费，请联系平台"); @@ -290,22 +289,5 @@ public class AliyunServiceImpl implements AliyunService { throw new MsgException("银行卡认证失败"); } } - Bank4Cache bank4Cache = new Bank4Cache(); - if (!"0".equalsIgnoreCase(jsonObject.getString("error_code"))) { - bank4Cache.setPhone(phone); - bank4Cache.setBankCardNo(bankCardNo); - bank4Cache.setIdCardNo(certNo); - bank4Cache.setName(realName); - Calendar instance = Calendar.getInstance(); - instance.add(Calendar.DAY_OF_MONTH, -1); - bank4Cache.setCreateTimeStart(instance.getTime()); - log.error("银行卡四要素检查：" + jsonObject.getString("reason")); - bank4Cache.setRemark(jsonObject.getString("reason")); - bank4Cache.setStatus(Bank4Cache.STATUS_FAIL); - throw new MsgException("身份证、银行卡或预留手机号信息不正确"); - } else { - bank4Cache.setStatus(Bank4Cache.STATUS_PASS); - bank4CacheService.save(bank4Cache); - } } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java index 675b378..df42ed7 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java @@ -352,11 +352,10 @@ public class AccountServiceImpl extends ServiceImpl impl if (accIdCard == null) { accIdCard = legalIdCard; idCardService.save(accIdCard); + } else { + accIdCard.setId(legalIdCard.getId()); + idCardService.updateById(accIdCard); } -// else { -// accIdCard.setId(legalIdCard.getId()); -// idCardService.updateById(accIdCard); -// } account.setIdCardId(accIdCard.getId() + ""); accountDTO.setIdcard(accIdCard); accountDTO.getBankCard().setBankHolder(accIdCard.getCertName()); @@ -379,13 +378,13 @@ public class AccountServiceImpl extends ServiceImpl impl } boolean settleTypeFlag = Account.SETTLE_TYPE_CORPORATE.equals(accountDTO.getSettleType()); - - if (checkFlag && !(settleTypeFlag)) { - // 执行银行卡四要素校验 - aliyunService.checkBankCorrectNow(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo() - , accountDTO.getIdcard().getCertNo() - , accountDTO.getBankCard().getBankHolder(), "结算人与结算银行卡不匹配，请核对结算信息"); - } + //TODO 测试时先注掉 +// if (checkFlag && !(settleTypeFlag)) { +// // 执行银行卡四要素校验 +// aliyunService.checkBankCorrectNow(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo() +// , accountDTO.getIdcard().getCertNo() +// , accountDTO.getBankCard().getBankHolder(), "结算人与结算银行卡不匹配，请核对结算信息"); +// } bankCardService.save(accountDTO.getBankCard()); account.setBankCardId(accountDTO.getBankCard().getId() + ""); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java index 27a206d..3788296 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java @@ -162,14 +162,15 @@ public class ApiPayServiceImpl implements ApiPayService { MerchantBaseInfo baseInfo = merchantBaseInfoMapper.selectOne(queryWrapper); Optional.ofNullable(baseInfo).orElseThrow(() -> new MsgException("当前商户暂未完成商户认证功能！")); // 全局电子围栏和单商户电子围栏判定 - if (!commonSwitchService.allowEcdemicPay() && !store.allowEcdemicPay()) { - // 不允许异地支付的时候需要校验ip和商户所在城市 - try { - merchantService.checkPayLocation(jsonObject.getString("ip"), baseInfo, jsonObject.getString("province")); - } catch (PayRiskException e) { - throw new MsgException(e.getMessage()); - } - } + //TODO 先关闭异地支付 +// if (!commonSwitchService.allowEcdemicPay() && !store.allowEcdemicPay()) { +// // 不允许异地支付的时候需要校验ip和商户所在城市 +// try { +// merchantService.checkPayLocation(jsonObject.getString("ip"), baseInfo, jsonObject.getString("province")); +// } catch (PayRiskException e) { +// throw new MsgException(e.getMessage()); +// } +// } MerchantChannelStatus channel = null; if("trans_wap_pay".equals(jsonObject.getString("method"))){ channel = merchantChannelStatusService.getByMerchantCode(baseInfo.getMerchantCode(),4);