diff --git a/.idea/artifacts/pluss_manage_page_war_exploded.xml b/.idea/artifacts/pluss_manage_page_war_exploded.xml
index 1465475..8969204 100644
--- a/.idea/artifacts/pluss_manage_page_war_exploded.xml
+++ b/.idea/artifacts/pluss_manage_page_war_exploded.xml
@@ -82,7 +82,6 @@
-
@@ -96,17 +95,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -114,8 +102,6 @@
-
-
@@ -191,6 +177,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index b863751..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,460 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1672035665897
-
-
- 1672035665897
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1674892648184
-
-
-
- 1674892648184
-
-
- 1674897664824
-
-
-
- 1674897664824
-
-
- 1674956689324
-
-
-
- 1674956689324
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- file://$PROJECT_DIR$/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java
- 95
-
-
-
- file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
- 2565
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pluss-api-page/pluss-api-page.iml b/pluss-api-page/pluss-api-page.iml
index 2114a4e..6749a36 100644
--- a/pluss-api-page/pluss-api-page.iml
+++ b/pluss-api-page/pluss-api-page.iml
@@ -126,8 +126,6 @@
-
-
@@ -216,6 +214,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/pluss-api-page/pom.xml b/pluss-api-page/pom.xml
index 53e9929..41a443a 100644
--- a/pluss-api-page/pom.xml
+++ b/pluss-api-page/pom.xml
@@ -101,6 +101,7 @@
swagger-bootstrap-ui
1.9.6
+
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-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 339f522..cb8bbd6 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -20,8 +20,10 @@ aliyun:
bucketname: czg-oss
callback: ${parameter.domain}/manage/upload/ossCallback
bankcard:
+ #旧地址 https://aliyun-bankcard4-verify.apistore.cn/bank4
bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4
- app-code: 11cb746de2704f5482a40fd36ed8a1f1
+ app-code: 11cb746de2704f5482a40fd36ed2sg6u
+ SceneId: 3931001
#阿里MQTT参数配置
mqtt:
@@ -88,6 +90,7 @@ spring:
port: 5672
parameter:
+ # 124.114.74.203本机ip
domain: http://60.205.224.68
ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
ALI_APP_ID: 支付宝原生接入的APPID
@@ -118,9 +121,9 @@ parameter:
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
# 百度人脸识别应用的AK
- baiduAK2:
+ baiduAK2: ASgPr1OxpI32E3G96rxWObuZ
# 百度人脸识别应用的SK
- baiduSK2:
+ baiduSK2: 80aOspiFxTgGmcWZoTinwlOOjRT6IRPE
fans_profit: 4.0E-4
idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
leshuaCallBackKey:
@@ -138,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/pluss-manage-page.iml b/pluss-manage-page/pluss-manage-page.iml
index 7a471df..9ade217 100644
--- a/pluss-manage-page/pluss-manage-page.iml
+++ b/pluss-manage-page/pluss-manage-page.iml
@@ -103,7 +103,6 @@
-
@@ -117,17 +116,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -135,8 +123,6 @@
-
-
@@ -212,6 +198,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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/pluss-service-bundle.iml b/pluss-service-bundle/pluss-service-bundle.iml
index f531d8f..7497b40 100644
--- a/pluss-service-bundle/pluss-service-bundle.iml
+++ b/pluss-service-bundle/pluss-service-bundle.iml
@@ -100,8 +100,6 @@
-
-
@@ -115,17 +113,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -135,8 +122,6 @@
-
-
@@ -225,6 +210,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pluss-service-bundle/pom.xml b/pluss-service-bundle/pom.xml
index 458ecdf..14b4f1c 100644
--- a/pluss-service-bundle/pom.xml
+++ b/pluss-service-bundle/pom.xml
@@ -68,6 +68,12 @@
1.1.2.RELEASE
+
+ com.aliyun
+ cloudauth20200618
+ 2.0.3
+
+
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java
index 23ae67c..5cc1e33 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java
@@ -142,11 +142,12 @@ public class BaiduFaceDetectServiceImpl implements BaiduFaceDetectService {
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ //TODO 图片压缩 暂时注释
+// try {
+// Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
dist = DatatypeConverter.printBase64Binary(baos.toByteArray());
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 44b1a9e..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
@@ -18,6 +18,15 @@ public interface AliyunService extends IpLocationService {
* @return 校验结果
*/
void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName);
+ /**
+ * 银行卡四要素（新）
+ * @param phone 手机号
+ * @param bankCardNo 银行卡号
+ * @param certNo 身份证号
+ * @param realName 姓名
+ * @return 校验结果
+ */
+ void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName);
/**
* 银行卡四要素
@@ -28,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 456ca0b..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
@@ -10,6 +10,7 @@ import cn.pluss.platform.util.HttpResult;
import cn.pluss.platform.util.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.aliyun.cloudauth20200618.models.VerifyBankElementResponse;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.auth.sts.AssumeRoleRequest;
@@ -29,6 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import com.aliyun.tea.*;
+import com.aliyun.cloudauth20200618.Client;
import java.util.*;
@@ -49,6 +52,21 @@ public class AliyunServiceImpl implements AliyunService {
@Value("${aliyun.bankcard.bank-url}")
private String bankCheckUrl;
+ /**
+ *场景id
+ */
+ @Value("${aliyun.bankcard.SceneId}")
+ private Long SceneId;
+ /**
+ * 阿里云key
+ */
+ @Value("${aliyun.keyid}")
+ private String ACCESSKEYID;
+ /**
+ * 阿里云secret
+ */
+ @Value("${aliyun.keysecret}")
+ private String ACCESSKEYSECRET;
/**
* 不好用
@@ -104,15 +122,23 @@ public class AliyunServiceImpl implements AliyunService {
// 调用阿里云银行卡认证接口
Map headers = new HashMap<>();
- headers.put("Authorization", "APPCODE " + appCode);
+ // headers.put("Authorization", "APPCODE " + appCode);
Map querys = new HashMap<>();
querys.put("Mobile", phone);
- querys.put("bankcard", bankCardNo);
- querys.put("cardNo", certNo);
- querys.put("realName", realName);
+// querys.put("bankcard", BankCardNo);
+ //querys.put("cardNo", certNo);
+// querys.put("realName", realName);
+ querys.put("Mode", "VERIFY_BANK_CARD");
+ querys.put("OuterOrderNo", appCode);
+ querys.put("BankCardNo", bankCardNo);
+ querys.put("IdName", realName);
+ querys.put("IdNo", certNo);
+ querys.put("SceneId", SceneId);
+
HttpResult response = null;
try {
- response = HttpUtil.doGet(bankCheckUrl, headers, querys);
+ // response = HttpUtil.doGet(bankCheckUrl, querys);
+ response = HttpUtil.doGet(bankCheckUrl, headers, querys);
log.info(response.toString());
} catch (Exception e) {
e.printStackTrace();
@@ -135,7 +161,6 @@ public class AliyunServiceImpl implements AliyunService {
log.error("银行卡四要素检查：" + jsonObject.getString("reason"));
bank4Cache.setRemark(jsonObject.getString("reason"));
bank4Cache.setStatus(Bank4Cache.STATUS_FAIL);
- bank4CacheService.save(bank4Cache);
throw new MsgException("身份证、银行卡或预留手机号信息不正确");
} else {
bank4Cache.setStatus(Bank4Cache.STATUS_PASS);
@@ -143,6 +168,8 @@ public class AliyunServiceImpl implements AliyunService {
}
}
+
+
@Override
public void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg) {
try {
@@ -152,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://", "");
@@ -194,4 +230,71 @@ public class AliyunServiceImpl implements AliyunService {
throw new MsgException("无法获取oss上传凭证");
}
}
+
+ public static com.aliyun.cloudauth20200618.Client createClient(String accessKeyId, String accessKeySecret) throws Exception{
+ com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
+ // 必填，您的 AccessKey ID
+ .setAccessKeyId(accessKeyId)
+ // 必填，您的 AccessKey Secret
+ .setAccessKeySecret(accessKeySecret);
+ // 访问的域名
+ config.endpoint = "cloudauth.aliyuncs.com";
+ return new com.aliyun.cloudauth20200618.Client(config);
+ }
+
+ @Override
+ public void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName) {
+ // java.util.List args = java.util.Arrays.asList(args_);
+
+ //com.aliyun.cloudauth20200618.Client client = Sample.createClient("accessKeyId", "accessKeySecret");
+ Client client = null;
+ try {
+ client = createClient(ACCESSKEYID,ACCESSKEYSECRET);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ com.aliyun.cloudauth20200618.models.VerifyBankElementRequest verifyBankElementRequest = new com.aliyun.cloudauth20200618.models.VerifyBankElementRequest()
+ .setMode("VERIFY_BANK_CARD")
+ .setBankCardNo(bankCardNo)
+ .setIdNo(certNo)
+ .setIdName(realName)
+ .setMobile(phone)
+ .setSceneId(SceneId)
+ .setOuterOrderNo(appCode);
+
+ com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
+
+ try {
+ // 复制代码运行请自行打印 API 的返回值
+ assert client != null;
+ VerifyBankElementResponse verifyBankElementResponse = client.verifyBankElementWithOptions(verifyBankElementRequest, runtime);
+ } catch (TeaException error) {
+ // 如有需要，请打印 error
+ com.aliyun.teautil.Common.assertAsString(error.message);
+ throw new MsgException("银行卡认证失败");
+ } catch (Exception _error) {
+ TeaException error = new TeaException(_error.getMessage(), _error);
+ // 如有需要，请打印 error
+ com.aliyun.teautil.Common.assertAsString(error.message);
+ throw new MsgException("银行卡认证失败");
+ }
+
+
+// if (200 != response.getCode()) {
+// if (403 == response.getCode()) {
+// throw new MsgException("银行卡认证接口已欠费，请联系平台");
+// } else {
+// throw new MsgException("银行卡认证失败");
+// }
+// }
+// if (!"0".equalsIgnoreCase(jsonObject.getString("error_code"))) {
+// 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 ec44c26..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(), "结算人与结算银行卡不匹配，请核对结算信息");
}
@@ -1251,8 +1251,9 @@ public class AccountServiceImpl extends ServiceImpl impl
}
Notice notice = new Notice(1, 5, userApp);
+ //TODO 银行卡认证先绕过四要素检测
try {
- aliyunService.checkBankCorrect(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName());
+ aliyunService.checkBankCorrectNow(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName());
} catch (MsgException e) {
notice = new Notice(1, 5, userApp);
notice.setConrtent("很遗憾你的银行卡认证未通过，请您核对信息后重新提交审核！");
@@ -1303,9 +1304,9 @@ public class AccountServiceImpl extends ServiceImpl impl
uaService.updateById(userApp);
// 调用极光通知推送
- List alias = new ArrayList<>();
- alias.add(userApp.getUserId().toString());
- generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1");
+// List alias = new ArrayList<>();
+// alias.add(userApp.getUserId().toString());
+// generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1");
}
@Override
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;
diff --git a/pluss-wap-page/pluss-wap-page.iml b/pluss-wap-page/pluss-wap-page.iml
index 773e4ef..a5cf495 100644
--- a/pluss-wap-page/pluss-wap-page.iml
+++ b/pluss-wap-page/pluss-wap-page.iml
@@ -213,6 +213,15 @@
+
+
+
+
+
+
+
+
+