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 4b68920..d70aec8 100644 Binary files a/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class and b/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class differ diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java index 3f5efa0..1994917 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java @@ -32,6 +32,7 @@ public class SxfConfg { public static final String SXF_WX_CERT_CANCEL = SXF_CERT_DOMAIN + "/merchant/realName/backApplyBill"; public static String PRIVATE_KEY = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMRFhTpr+JWtfhHZ80UJcnDCMeydtcF38S5s+WdifTYNMequFN6uRYoSFJqzQrR0ls7/ZAjUFP/dZL0QJAsWlnRLLSvPsgUU/DzAF7myl6/swuK4eo9frwAYP4ItQcP+DsHBUFnqUbWUON8C3M5ggY92qKfKV1k59tVnFVjoPhbbAgMBAAECgYAzL/5jEi2uu6SZe0Iayy/xgHQMxcTVRDa+aOVStTj6k85k6im/OawhKj39aqsG7TE3oxuvwcAISvEu7bq4uZdbICPdeKLcfNpK4pIfVfokPROjlKSyDgm37gqM7F+T0ZoARVqcd7Mgj09UKKpq7Pi0a/FusEa5CdG2LrUTjZuHIQJBAOFzolrGsPsWaVMpoYGeRY2UrT0PjfXJ1E7nkHqLXCCgfrur374YEEWeLtjHCI6zaXgv/3Coj3USAhKMw4lDAYcCQQDe3bL3szwkGdUmZk61ebY7HanilKnIYNuhC9ALUEElDp2eA1ld5cQvRb4BAeNsvabptt2lRPcscFu9zvH0DaUNAkEAww8HAz8xVKyZSAiW4cyMJOjj0hapHmUXOYWELWJxvRDfVYRpOtEbEwC/S3M45i44LHJqsZBFPmbsQBxl+VZt9QJBAL2tD+EywU+0UK2SyxA2mzqq32iAwBNTI/lnlVPbpOYGD21pSkjZAWR+RdyTn9xveLxWr0M2c+t1YQ8lLtVYO40CQQC2pVlYu5BIvXClLj6pHxwrK9G3JgwaanbEPFX0PjIJmU94QSLUd4OtDhvbXq43E5dlyvz5ybYvd8pygmjV9oM5"; + //"MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMRFhTpr+JWtfhHZ80UJcnDCMeydtcF38S5s+WdifTYNMequFN6uRYoSFJqzQrR0ls7/ZAjUFP/dZL0QJAsWlnRLLSvPsgUU/DzAF7myl6/swuK4eo9frwAYP4ItQcP+DsHBUFnqUbWUON8C3M5ggY92qKfKV1k59tVnFVjoPhbbAgMBAAECgYAzL/5jEi2uu6SZe0Iayy/xgHQMxcTVRDa+aOVStTj6k85k6im/OawhKj39aqsG7TE3oxuvwcAISvEu7bq4uZdbICPdeKLcfNpK4pIfVfokPROjlKSyDgm37gqM7F+T0ZoARVqcd7Mgj09UKKpq7Pi0a/FusEa5CdG2LrUTjZuHIQJBAOFzolrGsPsWaVMpoYGeRY2UrT0PjfXJ1E7nkHqLXCCgfrur374YEEWeLtjHCI6zaXgv/3Coj3USAhKMw4lDAYcCQQDe3bL3szwkGdUmZk61ebY7HanilKnIYNuhC9ALUEElDp2eA1ld5cQvRb4BAeNsvabptt2lRPcscFu9zvH0DaUNAkEAww8HAz8xVKyZSAiW4cyMJOjj0hapHmUXOYWELWJxvRDfVYRpOtEbEwC/S3M45i44LHJqsZBFPmbsQBxl+VZt9QJBAL2tD+EywU+0UK2SyxA2mzqq32iAwBNTI/lnlVPbpOYGD21pSkjZAWR+RdyTn9xveLxWr0M2c+t1YQ8lLtVYO40CQQC2pVlYu5BIvXClLj6pHxwrK9G3JgwaanbEPFX0PjIJmU94QSLUd4OtDhvbXq43E5dlyvz5ybYvd8pygmjV9oM5"; public static String PUBLIC_KEY; /** * sxf渠道号 diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml index 3af5680..30eb008 100644 --- a/pluss-common-bundle/src/main/resources/config/application-common.yml +++ b/pluss-common-bundle/src/main/resources/config/application-common.yml @@ -141,8 +141,8 @@ parameter: ## 默认为正式环境 sxf: domain: https://openapi.tianquetech.com - orgId: - publicKey: + orgId: "02668880" + publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMYLeOJ19Ju4ii0xH66ZxFd869EWFWk/EJa3xIA2+4qGf/Ic7m7zi/NHuCnfUtUDmUdP0JfaZiYwn+1Ek7tYAOc1+1GxhzcexSJLyJlR2JLMfEM+rZooW4Ei7q3a8jdTWUNoak/bVPXnLEVLrbIguXABERQ0Ze0X9Fs0y/zkQFg8UjxUN88g2CRfMC6LldHm7UBo+d+WlpOYH7u0OTzoLLiP/04N1cfTgjjtqTBI7qkOGxYs6aBZHG1DJ6WdP+5w+ho91sBTVajsCxAaMoExWQM2ipf/1qGdsWmkZScPflBqg7m0olOD87ymAVP/3Tcbvi34bDfwIDAQAB getui: domain: https://restapi.getui.com/v2/${getui.appId} diff --git a/pluss-common-bundle/target/classes/config/application-common.yml b/pluss-common-bundle/target/classes/config/application-common.yml index 3af5680..30eb008 100644 --- a/pluss-common-bundle/target/classes/config/application-common.yml +++ b/pluss-common-bundle/target/classes/config/application-common.yml @@ -141,8 +141,8 @@ parameter: ## 默认为正式环境 sxf: domain: https://openapi.tianquetech.com - orgId: - publicKey: + orgId: "02668880" + publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMYLeOJ19Ju4ii0xH66ZxFd869EWFWk/EJa3xIA2+4qGf/Ic7m7zi/NHuCnfUtUDmUdP0JfaZiYwn+1Ek7tYAOc1+1GxhzcexSJLyJlR2JLMfEM+rZooW4Ei7q3a8jdTWUNoak/bVPXnLEVLrbIguXABERQ0Ze0X9Fs0y/zkQFg8UjxUN88g2CRfMC6LldHm7UBo+d+WlpOYH7u0OTzoLLiP/04N1cfTgjjtqTBI7qkOGxYs6aBZHG1DJ6WdP+5w+ho91sBTVajsCxAaMoExWQM2ipf/1qGdsWmkZScPflBqg7m0olOD87ymAVP/3Tcbvi34bDfwIDAQAB getui: domain: https://restapi.getui.com/v2/${getui.appId} diff --git a/pluss-manage-page/src/main/resources/application-dev.yml b/pluss-manage-page/src/main/resources/application-dev.yml index 64711c0..47a606e 100644 --- a/pluss-manage-page/src/main/resources/application-dev.yml +++ b/pluss-manage-page/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ spring: datasource: druid: - url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true username: root password: CZGmysqlroot@123 driver-class-name: com.mysql.jdbc.Driver diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java index 36bede9..62fce63 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java @@ -23,7 +23,7 @@ import java.util.Objects; public class AccountDTO extends Account { /** - * 进件状态 + * 进件状态。0或无、待审核，1、审核中 2、审核失败 */ private String status; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java index 83130ed..bfba3e4 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java @@ -37,6 +37,15 @@ public interface AliyunService extends IpLocationService { * @return 校验结果 */ void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg); + /** + * 银行卡四要素（新） + * @param phone 手机号 + * @param bankCardNo 银行卡号 + * @param certNo 身份证号 + * @param realName 姓名 + * @return 校验结果 + */ + void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName,String errorMsg); AssumeRoleResponse.Credentials stsToken(String userId); } \ No newline at end of file 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 1f4d51b..f2969ea 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 @@ -179,6 +179,15 @@ public class AliyunServiceImpl implements AliyunService { } } + @Override + public void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName, String errorMsg) { + try { + checkBankCorrectNow(phone, bankCardNo, certNo, realName); + } catch (Exception e) { + throw new MsgException(errorMsg); + } + } + @Override public AssumeRoleResponse.Credentials stsToken(String userId) { String endpoint = stsConfig.getEndpoint().replace("https://", ""); 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 7e9c166..b046a20 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 @@ -381,7 +381,7 @@ public class AccountServiceImpl extends ServiceImpl 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;