From b9b03306595f40f2f08195f32f77bdc43004db6c Mon Sep 17 00:00:00 2001 From: lyf <1357764963@qq> Date: Thu, 2 Feb 2023 15:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E7=9B=B8=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AccountController.java | 2 +- .../controller/MerchantOrderController.java | 1 + .../controller/UserAppController.java | 4 ++-- .../callback/AuditCallbackController.java | 1 + .../controller/UserAppController.class | Bin 48911 -> 49026 bytes .../java/cn/pluss/platform/util/SxfConfg.java | 1 + .../resources/config/application-common.yml | 4 ++-- .../classes/config/application-common.yml | 4 ++-- .../src/main/resources/application-dev.yml | 2 +- .../cn/pluss/platform/dto/AccountDTO.java | 2 +- .../pluss/platform/common/AliyunService.java | 9 +++++++++ .../common/impl/AliyunServiceImpl.java | 9 +++++++++ .../impl/account/AccountServiceImpl.java | 2 +- .../audit/SxfMerchantAuditServiceImpl.java | 1 + .../platform/wx/impl/WxTalkServiceImpl.java | 10 ++++++---- 15 files changed, 38 insertions(+), 14 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java index a826ab3..5228849 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java @@ -53,7 +53,7 @@ public class AccountController { } /** - * 保存商户结算信息, 最新接口 + * 保存商户结算信息, 最新接口 最最最新 * * @return */ diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java index 27e4a5e..8442660 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java @@ -726,6 +726,7 @@ public class MerchantOrderController { result = ysPayOldService.tradeQuery(order,channel.getMerchantId()); break; } + if(result != null){ merchantOrderService.updateOrderStatus(result,order); String status = result.getString("payStatus"); diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java index 6b18d4a..6b29793 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java @@ -629,7 +629,7 @@ public class UserAppController { opDetail = "商户请求进件" ) @PostMapping("/merchantAudit") - @ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST") + @ApiOperation(value = "通用进件， 商户进件请求", notes = "通用进件", httpMethod = "POST") @ApiImplicitParams( { @ApiImplicitParam( @@ -647,7 +647,7 @@ public class UserAppController { } @PostMapping("/editMerchantAudit") - @ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST") + @ApiOperation(value = "通用进件，当前特指修改结算信息，只允许修改结算信息", notes = "通用进件", httpMethod = "POST") @ApiImplicitParams( { @ApiImplicitParam( diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java index 58a1e27..a95577b 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java @@ -47,6 +47,7 @@ public class AuditCallbackController { private YsConfigV2 ysConfig; @PostMapping("sxf") + // TODO 后续需要接sxf的回调 public Map sxfAuditCallback(@RequestBody JSONObject result) throws Exception { return sxfMerchantAuditService.merchantAuditCallback(result); } diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class index 4b68920b69d1d654d85aed854d2e71ffb4ebbc7c..d70aec8e6c63f0ca2b61d6027fb608d66190a240 100644 GIT binary patch delta 7450 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 impl if (checkFlag && !(settleTypeFlag)) { // 执行银行卡四要素校验 - aliyunService.checkBankCorrect(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo() + aliyunService.checkBankCorrectNow(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo() , accountDTO.getIdcard().getCertNo() , accountDTO.getBankCard().getBankHolder(), "结算人与结算银行卡不匹配，请核对结算信息"); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java index 832430e..60a5d4e 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java @@ -605,6 +605,7 @@ public class SxfMerchantAuditServiceImpl extends BaseMerchantAuditService { // 判断经营类型 switch (sxfMccInfo.getFMccType()) { case "线上": + //TODO 如果渠道判定魏线上则 onlineType onlineName为必填 map.put("operationalType", "02"); break; case "非盈利": diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java index 5863324..ba87b29 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java @@ -40,14 +40,16 @@ import java.util.Map; public class WxTalkServiceImpl implements WxTalkService { /** - * 企业微信审核机器人的链接 + * 企业微信审核机器人的链接 https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=eba1e093-4cae-424d-be52-7013411194cc */ - private static final String WX_TALK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=eba1e093-4cae-424d-be52-7013411194cc"; + //TODO 后面需要换成我们自己的 + private static final String WX_TALK_URL = ""; /** - * 企业微信上市机器人的链接 + * 企业微信上市机器人的链接 https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d89ed4ad-d723-4dce-a80b-bbf370c91943 */ - public static final String WX_GO_PUBLIC_TALK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d89ed4ad-d723-4dce-a80b-bbf370c91943"; + //TODO 后面需要换成我们自己的 + public static final String WX_GO_PUBLIC_TALK_URL = ""; private final RestTemplate restTemplate;