From b5ddf6eb9dd75b13f3e9b09725e9fdcc33459dff Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Mon, 30 Jan 2023 09:35:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?wap=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 47 +++++++++---------
.../resources/config/application-common.yml | 5 +-
.../classes/config/application-common.yml | 5 +-
.../impl/BaiduFaceDetectServiceImpl.java | 11 ++--
.../impl/BaiduFaceDetectServiceImpl.class | Bin 9512 -> 8906 bytes
5 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7a01b96..0795b6c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,12 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -85,15 +77,13 @@
-
+
-
-
-
+
@@ -159,7 +149,8 @@
-
+
+
1674892648184
@@ -182,7 +173,14 @@
1674956689324
-
+
+ 1674959790671
+
+
+
+ 1674959790671
+
+
@@ -216,7 +214,8 @@
-
+
+
@@ -226,16 +225,16 @@
336
-
- 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
+
+ file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
+ 1478
+
+
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 84e9af1..fe24dd0 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -88,6 +88,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 +119,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:
diff --git a/pluss-common-bundle/target/classes/config/application-common.yml b/pluss-common-bundle/target/classes/config/application-common.yml
index 84e9af1..fe24dd0 100644
--- a/pluss-common-bundle/target/classes/config/application-common.yml
+++ b/pluss-common-bundle/target/classes/config/application-common.yml
@@ -88,6 +88,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 +119,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:
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/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class b/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class
index fef89f9d7a6798c39148bbb0b78b8da7a08b7f03..71671e7f0634dc96bc30e4c4624462fcca7b190b 100644
GIT binary patch
delta 2776
zcmbtWd3=<`8GfEU^38rbA<2?N5)xPv10e~ak%)i|(1t4z1m%bvY9cNW2qY%ql(3Y`
zdZ5UFfP#Y7f;|Kq3b(}
z@dKQ4#rmNY&%1a5FGd9JjEkS+Wf!mD7ZDI=9K5RVE9<`&fzJ;A8gEz;|BVg))`I;m
zjNju;2X86-!9_2;t?);MKPkN9;Lk3u#BqhcSp8RpvkHGx_`AYC6y8<%r^3G!{;lvI
z3-q3g_i;|)ymc-pd|;FQFiemNj|u{P3VW^g2jh~g{Y-WlV9<&LSw$yI#gI#vVV9bT
z4!gM+#UzKxF2-0!#xTW>M5JzZcbMv8f(=h#nqs=uS6I=*f@Or6$(}B=nC-F`dn-n*
z?xUEaCNkF!Txms~Vqa+j`&g%+V!qY=6$`8`R4lT3fMT)2T89G_KjmUB-ga2x@+uB;
zSlap)ivzscq$iwkOB@as;v8OMUP~x8`OfnuLA{y05_dQpqB#`nHHTrnIj_d~ujQxB
z*wBcAG7CIha|B0fG@{AjXEZ;{a*ca%ug2%>@F>mE9AgfK(u>C?vmhzRamlRk3x`1~
zpqbC{4ku{lveMzzniF}Q%$j804dwNn%26cE#^Qtb4nc+5uwId(~`R8=&-2fwXAkn
zqj@X#YtG?qnla854m9U+zGf{KXe`AthYL09xX9sR&3ao_gXZmQB(hA4lNHoh$tF{#
zqe+_0T%x&@%QUuQhj~f&Enm(Ra+pdqSMmZ@w9s
znitf(3u`@M8dB25yIVY`+xE~sn)h-OQEX28dzh2mHZsq=;p=Xq$${3#k`7Sc$NODw
z<^#m=d~@2#G|N)vFlt^5M9s@7RsPM~Vy=pmCv2u6qFqb3L}vThTV`dL$xecKCv9Qt
zjw>2{J+^9Y<4%V~(qF9A%&{WMVw00OB>Q0^p|ZYy;gSYIS1eu}Yb>v;X=;i!5gYT(
z-pn3mO=dlJnX{Rd@mhIqh=oW%CZvsWa(s~XN~}Tb1kty9F*$~p#f0t4V$#*iVsfPZ
zC#J-gD*%qbDuEv;E=30m4uem7`?ZL)y8{JSEmF5nKpbntqrC(oSDE*Fj$(@$k=3)@
z&MK8B1{l;aDx|K7^5vjbiyRK=AJrDyf7}t
zA_)~<2I;aINbSIOW$Z58EvtO?R(h+?WgU@R4rQ0eZ7#zFAK2G1-&*bS19%*paG$Ij
ziFvpmn`N)5n1Tl+7Qi+{utj1)7+G!iY@feXtoB)3y;(pqd>1gu!GpYj=~hV&ay7h6
zmi9U;nat}w%gbaoLW1>rS0=Axr^kwoJ>;?C$E$eQVEl2t-X_;#YNKWG45tm_j-aBlAR|!NhVjQRVa8!p4pSMbs11=eOsvXKk?YzpsY6e$
zDmaAeGt{%V!H24gCug{H4boNHqa^84w)7}hSnn?!mkPUO!qgaHVWLz$UFxltO6Mc~
zh#dMolGk3Z;qA1wbkWx0kwpP*@>=N=*lIk9FG&r#n29fYwDp%ZeFa|?+Dhf%JcR>7
zTbZ=_Af6W5rlTLehE^!~0Xu|e+F9^z5Cl1JiN3)FZJ1K&E0f}OMgRLW&YaWCJGPkL8<
z7U~%0&WOxAjQJk
delta 3443
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
Date: Tue, 31 Jan 2023 14:56:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=BB=91?=
=?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pluss-api-page/pom.xml | 1 +
.../resources/config/application-common.yml | 4 +-
.../classes/config/application-common.yml | 4 +-
.../converter/BankCardConverterImpl.java | 2 +-
.../platform/converter/ConverterImpl.java | 2 +-
.../platform/converter/ImgConverterImpl.java | 2 +-
.../MerchantBaseInfoConverterImpl.java | 2 +-
.../MerchantCashPlaceConverterImpl.java | 2 +-
.../converter/MerchantStaffConverterImpl.java | 2 +-
.../converter/UserAppConverterImpl.java | 2 +-
pluss-service-bundle/pom.xml | 6 +
.../pluss/platform/common/AliyunService.java | 9 ++
.../common/impl/AliyunServiceImpl.java | 106 +++++++++++++++++-
.../impl/account/AccountServiceImpl.java | 9 +-
.../impl/BaiduFaceDetectServiceImpl.class | Bin 8906 -> 8906 bytes
15 files changed, 134 insertions(+), 19 deletions(-)
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-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
index fe24dd0..3af5680 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:
diff --git a/pluss-common-bundle/target/classes/config/application-common.yml b/pluss-common-bundle/target/classes/config/application-common.yml
index fe24dd0..3af5680 100644
--- a/pluss-common-bundle/target/classes/config/application-common.yml
+++ b/pluss-common-bundle/target/classes/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:
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
index e940cd7..fc34447 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:04+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class BankCardConverterImpl implements BankCardConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
index ccdeeba..32b9524 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
@@ -48,7 +48,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:03+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class ConverterImpl implements Converter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
index 92d493e..5237bbf 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
@@ -5,7 +5,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:03+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class ImgConverterImpl implements ImgConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
index d024a30..4b2f3cd 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
@@ -11,7 +11,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:03+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantBaseInfoConverterImpl implements MerchantBaseInfoConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
index 96538dd..bf8b200 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:04+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantCashPlaceConverterImpl implements MerchantCashPlaceConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
index 20f9896..bfcda51 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:03+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantStaffConverterImpl implements MerchantStaffConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
index 6e15f9b..c3af087 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
@@ -9,7 +9,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-29T10:16:06+0800",
+ date = "2023-01-30T11:00:03+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class UserAppConverterImpl implements UserAppConverter {
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/common/AliyunService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java
index 44b1a9e..83130ed 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);
/**
* 银行卡四要素
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..1f4d51b 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 {
@@ -194,4 +221,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..7e9c166 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
@@ -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/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class b/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class
index 71671e7f0634dc96bc30e4c4624462fcca7b190b..203ccb3c68b689bc8921f8248af47a52dd9958b6 100644
GIT binary patch
delta 42
ycmX@*ddhW!p}g!21~-OT489C=7{VClG9)m}W5{5b&rraykfDZQ(PlsS8fE|&<_u#1
delta 42
ycmX@*ddhW!p}g#L1~-P8489Dr8NwLmFeEU{WyoNd$56nqfT4zA;buSi8fE|&Mhsg3
From b9b03306595f40f2f08195f32f77bdc43004db6c Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Thu, 2 Feb 2023 15:23:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E8=B0=83=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
zcma)B2Y6M*ww|_TPxcvlO(3C!(1e80n-DsI(4+}Si6ns_O%kwTz(NzG3`J2CM7@X<
z_0W5hA}Sy@EFelk5EZb2NO^0W6utLx-}myJtXWgmKdbMZlexFVleb0I`?t33VvIG^
z4|{Tv&$wJ{<-jcE}Yzi;}MzxsoQYdGd9i
z6_am}%)bJ1m3-5at9|*FT;t2NavgE&iM&nZ9U|}gtdtCzEEyAEf5;6+ZuI0P!dy%e
zn~B>(KwFL6MptYP$Q^R0k-L1}Q0_Kz4=J;kj_spk`#pKUXLV2-$$O;6!GJs@57Vh5
zo_ybD_2p4tejq;#$dBYPBaf5RiLfj@`Efv=l%E*+DUF{Q`8f%F;mK1zYlZF*X*7OG
zm|uDFYoE0v9lw#Mi92KDw=|v&$nWI$MxOI!w#*@N-pE`Myg-6K5O*;kf0RFw%0K(^
zlDur>6}0~sTKJX7Z$y44z5XC_m8RE>{L{$mWb|J&zd<`Ujl4xs!BE}CQ8A-9ZYqJB
zN*bj+1wKnBXGAHDcPS62%Ah7HETDW9KxZmzR1rT5qlPA;P*J0bd8)Y2CgsVMKu(n;
z;Zh`5I-ts^vPP9Nsyyw4`zk_JAX1TbB7GI5Dj8MTs47NOGpZ^HMF&(h6=PI&U)4}G
zjjCl-ZKLj@tvUf!SH=4EQ7q1gd2~-bBjy{izzAnlyixUySQw@nsD`xH$cRNoEHB9>8tV$D
z&lok0#_2?6;If+OsaZa|D32QTEZsias5vw~=c&0qyQ1b1neV9ubdB@WLc{;UT2hOA
zp0!<`_0(e8z*@epp7+%Y3JdwV!a_c&ULvxL-10J!SA4Y`eS%(IVbrUhTIqAlEn0ky
z^5k_aNc9GJn<`taqO~^zYPEWc$QsOkwbrP0bYQ(vZyWWFpM|pT8u_46K_f9GHW1iG
zqc+jF*{CfvZY8pf$abT45cEz@VR=X6-8@?DCjaaSsJ&_*P4^T20pbL4?-_NF4jc-o
z!|DjFyia>aiTl80sSk>Z{L`FzRy}zcA_)$$v@r
zeMQ{YMtx({X`{{<^(`&*Bt$IpL+U%DzBlR|C0a|PvOSgK^KPVcH+7zL$_-?x3+e}>
zE*kYCt^Q=x&qiG`vLV&MWlvo(>KC66Py=cHD{;RO_q&mejBIXXc_W({ndPfL)Kw#&
z!RlAnX!55~*GY}PjJjdeO;YO?S#=vbDliNTa32K7ECY%dFrW>128<73;1dZDu_y#Z
zP**5Q-S%t%ia~KAC5-HCprmBaFP>s#9|NU)J`GBv5m1J>vL2M9u{^DW6N&Jkg3o7#
z%m-`*7a%gAvZ_H89jj!ZGL2P?9Ae~9BZnE8Om|l`5KUt>A~8thG6U7oxlqG{nm%7f
zc*|4^B6p+3PzyPzO&hr}}jAnt=ue8qyVwh&1;3
zcDa}&n-FPAq#2RsL|S;z(ucdDm4VhYPw=2kaIjasNRdq*w8c$KCVY^%_|f5RUeido
zr=cG_Uix0GPI=HSSf|2dp_XFb4X%w`%l+aWwD+I`7G*G{QVNf*dSS}a^9xty?tbyy
z_Dz>|%&wfhXj;yU&3W_O^_z3vdD0!MJT9s0f1JzS>9S|eIX`o2&g|*ucCX7>xb^&Y
zcYfWHbGujMOkIya*>hKCKQlFV-Io8o8*EUeBJf$kp4FFXucHT@u)2a*>ZEf20H!P^
zA!q&F{C?$KkGi$p@$%(@TVuB?D2J;xU7KoAE}?ew;E4vEl&ZdQ$Entp>-2?woRt`rJSjPDVrKg2xX#HLBfBM!C#3$C
z@8$bExYxn}7|2oVBlEWH1;O`od@owS_S-mNUr6OioL)Fb>AMKtg1Z2SucX
z36NnS6DGQZ^fGQrpJHV!OoE3jKf>Sl;9(1oz@uoX8=FwQ;bU^P2aj8r3{QBFWnl{W
z%x2G6e&L1JvR`{Acf;!zroxk!@8)|vc*=@i@U%Oe5FPOhOv8h@>t4%UKQ(8@yzE)8
zkn^T=(=UdFv0;R6{o!_{h2C2OXIS;7(Oz2Y-U{g*tBs&ADr-r
zg*nj2gXb*Fg?SjWdZ8c8SPSz>ZUH#X!jdPZq-Q3gh=ql)$nu?hmxaY7xWtN67+!cD
zGCX*}!crK|S^0?>sS^@YFqZB}o9IT9(4X)kp}hplEW8ZkExZEDEv$e(oN@e>{Stdx
zcokM!c#V#{4$EDYwv{Wt0V6moJ|<&$Y=PqK#-(7m{zYJ`;7ym@wq2#wGcIgE@4-QI+Jw~1N5-e3De;_n
zsbf=U+wx=lxCe(U9EKwn-iMQ
z9jkGE#SQEy=;nw-zlU1AaWIp>)TGvO6PLyMmmId
zw}opotLM%ZjV)F!o+|iH3)kT<&Z4mbq9f`08=MvSyH!w|z^c7TCmu|RY(}ZvuLqsG
zW#Kj&rkT|oE?O<{RxP!%;+h64Zfb3{r;P_4DVf$RNUYl~35`lwbSYgLv!g!#Hn8w6_OtPcH9Ou9L9}UHT3SYGrqyL=
zW=E%HjGUOmidIMJ
zD61=xTxHA?T?Ll?LpW4H{6qecr>j~W4g0OGremzGPUmYt1|B{C;)a~(Ue9@MRqmX5
zR@a1OZbX+BooiWLTi<1M9c-Ptu8#F|9JUmEIGx+EJnwOJe#heT%coL?p)Fy!bN+?x
z**h1Z2B@8`r{k@zkH-JdrIl%bjZ!z%japM`iJK{q@cf#hZJ6oNY=l5|Lv6
z^*wG)Qj;QmbYH9ck<$J3z3y^SxejCW0ILULi_(MieVi5jJ8|2i-c}FRL$Gb?p;iy0
za3$;eF>x|NUC8R;h$K^Vic9JiUo};ySv^9JO8$rvAB
z#*J$l*3jw)$mY?MA!Bq`%YWoQd3vnX<21H#mDDf3p4AVM{i-*$XFUOX!If@hO$N4Z
z`Lxb-#kwcyiB?b24+WFEf6<)3<1WuE7yd54ogspvd4^~qT4sn1;_iW>72{%~8#S{x
z-{f}9j4rlWlwgw1Z4qTNL`bf}f0NrPwz;aa`Zn7xb|A_o{4PQ<&MxvB$O*BNU%;_5
zlcE^o{PrNmGsLa}^xcHMo3tvvhi=;zIO+}
zg9U(x2=Gt{@Gt=$A;7}~csK<3zBuYuJ=-Sk1My)Y;74}=JXQdBoB)sicfb?k<6!^U
zuZygc;uB_h9o9^Iid+#^m$wq1@hc2iW8O%7j+|zFd0FuVavn?NTAV`8u+i+c_)?^>
zFgB6>A-=*j{Hu^XD!#_G03X9jiK^loL}7dizsj$nFOd_c@fhEV#D%n@>#!-A%YcU_lR6KX?~Tv@(k(uZ-!hzLzE~P%BLSlp^IeDMb~Cpx$1XR
zUqs-29yTgbk9;Uj1aHsp#Vh5-D3Z0xk5L0wGe1UcS-3dm#>guEfHMm*g@uL7wXBz5C&DVygb
zUeFhAid$~aqOS6`WNz>3YAq!Xmk75=x!E0D*f5+A#DOE4h=crT`CH9BTPu`F1VKx;+v
z;wy`aTfwv?kDIJw0>5A5mbI3|`Ro*%D2pTKv7cD7EFmgk6((|!C28xru^P{nL6k5Nk;SgavdDsnMrgW3
ziv)Hw1mmg6>?v7J0JCa6>m|#JIjjgIvRX166RZfhLhfUhC?inTs*<9ttRO2gU){|w
z%1A^Gs4!6}PZ`Ga+=4{Za|MQsWpNg+C&?&0C|DIeR#rkzvf4UTRz^gbI;AH=W%9|X|0kVUcv3*@Pc=kirXE?;Hj3RDghs*Km=
ztBiR0iU#r(xu6z8|s-0@xW(Qf({{`_{qM!cNG*~9ans1gsdxLgLPM)g1~JVhffHj2FiM_#G9qE
zC}k82%Jo8G8Ug!K&IskI<|Sk=QCU>M-dJDOlkvzI{-QV}>&pf#j9(L@LfPTtb0|SJ
z!~_k941P&ALe7fm{43cQbE1e?&x4`#Eh-N3mt+&!6u*~__{k`LMWYOVleKlL|&$g?22j0*dCcAyP+Zd*eKcE%~=!4d$_mO#PFW(#F|pod;J$I
zYPRJ^Ip5ImsH~m&R0)iY;eTWM45Elf8->B)ikVXQ&Ey9R}NZ&7^g7rq(D`%s_3
z!K>@X$Od$`V7)QQLqhrt<=@Mp$SIb>PlxUX_6A0I7_MpdE}tip-I8Ff!2S5fa)do1
z7RmeF(O@*M;w}Xf_&_&xLn+s8Luur$Z>SlX*Z4p9t{dr0=EgcmS8S|{^w`EYq_;O#
z4ZoA(!%^`R*L+h_lT_53hkRi%_kC;+shD8-FOKp~vS}zg!tLC&u>)nh5Y;iRC~=c@
z50zlce1DA$`706+r_=L^UOMC``M@A1Qsrn7Me4(H=tSK6&{!A0H9kD^4&j)H=O?XvY%8zy5LTpQ_po^W
zmwXuWn|dzU7sXP=DyRtimhCdUs$7iKOy+yFHn31Qj
z%g6;=Duho9J-S0L6+P)aGebUug45-U;JzIXaXC}YaxHiDmCxe$APaXjX+H-w5%Rgv
qeKoMv&t(jqp8uDFoG0hwd_mqzg3EjTlMDF{6vBUb;)`?W=YIeq68{y=y)AG51d|obd<#PFgkuSPzn|#S-RpkmJU#6Q^
z9J$hE#pNo}c{Lzkldn5+wJZN2*SPWx`A_235_ywI4v}>(D=ptLAsHKBSLNGA<~njc
zVJ;?(4a99EpiM?@rX#ilx6Z(Id7OoKanaD3>*RMo=quZ-S{%+(oa{3RtzfLun?R
zaZ@qeRNN@xDCx2c3Px3>@GJ#*t2A1ooPaVa0)wesqXKRSvxY88qpVSpjw>Yl
zky9l|xg_b83aHYmj8SEcDn~ozT~$FC%t
zSH-ECM#URd%c$D4RVSeCQVDJ=RI6*m0y-zrh=oQhGQu;eo>56gERIn1RRh{bFVrP>5REoT__q|jY^?wH>0}Ku{~VXQ}uGy
z-Kw`yeQ2d`K=o7ojT+#nfkq9&T2uEJHQ1mu3LE*l!bU!%o+q-5!m^ym3$A(*V}enB$*2{MdfDYz
zTeSEJ)yYb1NVSS$PMxh@qqWxqYPI?Yku_NT>J6j*Ndjw)def*JQe9_cXp&KH8HpwF
zHm&3uwVtjUjM_-oO++>m*<#c?1ijT!*xs>tHjh=?DLy*_YNy&ox9_^Fs@hE)Bknz;
z_K?8dfZC_trM-daq4SOscg(1-jrzu@<3@c;3%v*u+kCG&Y1ApBzN12GVbp0yopE_jGPN
z)H!t?(|p0G?`id-Q9l@U$;bxO2R}OMC!;RAe6YHQ?ynH{GjYEd+0e*lMwTI%fGEkMoqm3MDpqdkDi5^2da!`vlejyKOgg~7D+yx0F(#$|z5=b;qkFH51c(uKO`UV=%
z5e5au<|&
zR;$Afw9iebJVU5wan|OpjatjyVh(h0AQ>AmH!V7idzY$Z=B|#Z1bj~Jdo`cePDcki
zVS(qS)lKKlZmb%tgWOLO%Y!P**&wfd)0kY_D5O+P&MtdNy(@boro`kPY*t5Cd`!;c
zOg}Jf;+XUd3!R~h_k;eNl^mZsJ+X
zRUrc{$y>T2Z|$mci&y8(*<_&~jK`o_xDO_92EnY5}Mg1($_%%vQdg6UlWFI#wpL{`F!
z-r^3`s;z=_&PrqkM<*5|!FJ`rBjtUCnzJBo|9IrhEr53JC~i=x-ncT
z{4CFN;5#dJ!f9_)r+cydyLe?fH>r8X!dX(wv*HB5;=nlz=ivgLKA?YRI{kYK7vZ=!
zxpS2&Kfom`j(~^Q8JVeL(??)nvZe(s{0J9vS9h+#`A^5A1+wU@F>l-u;QwgR@~6aYS7w&
zj#MaXykJV*WCz18>SK*)qa!Rnd&XHEfDEgxj>I8obuq}Xx;QMvmeM6SV^){crLc+{
z;9o-v>u^M!PN|hV65c{jCXE>rOwY2qG~L+=>A`W+Qu`IeNteNsbXg+hs10mkh4)I$
zOt-qcuHg0RmNtgfu9SRF+wRk1L1G%Wj*p5Gb#BmS|Yt63cb?^<15
z$68&3v2HE9##>!W*S5M2PD6c{PH=Qx92Mtt
zHl5kF;%xTgIP}hKTXJs2EGj8_Lds2^pz4aGlh&w5jRApw%77
z?PN-EM;!3F6HZ#)+3GF@v7Qu6%$k&yI-zqqB6QU$=vF4Kjh-}ZVwQKZM}_!qR(D4|
ztT$}Ku~axcbWh7q@$Ven%j&yzZ>#(0-d=RirWt*8Kdbwb(F62A4BefoOirDUJ~1tI
zDwd`mWc58bh4f&3FK5N>$aF+ctRA9=;$+mrtR7C88=*&H`2_tzV|6NG%Taoix3g#c
z=+QdO>U2GZv*P$*I*Wg1nxN^g7aluk%jMEMM_0o*xu%ixxrAQnU(+T+#Yo(S~uc-a9_GAK&2BpBGzvqbSKF
z$*mLRkdR*G|4wg{*z9G`8&H0Wcn487;3s^=IJ?MiA}7RFul>Bz#kUpWZ700#gjZ_^
z;qM?jc90!Ad^qG7%$oC0y
zA3^T>kB}dT{a)p#+D9G`2a6y-^dUbgg#4HwKmNZ%ej+~2J@C}4B6LW6#w<@@&Bf=)
zMY6iQjrf9JVZfU3#^OulG#kLniLa1zSUL{3!^jynf#r)MB8^3`Y3!;vifj0Zi#;fg
z;aY%aveKfu_!?0dpUHpc*Dy55iEmI2M;da+krS+XF+N;;i>zeve6Tp--JCyo+(~``
zrN>}8Z=<{ULl_T=Q-zLxM~;3cDg;G6(YRn+v=dDjh^9e=$7r6WXnsS{{Kk)F(e82D
zJwv<4Y4^CdeL-b@);qdjXCLxdu_%`4dkm~0tKfUASqB#3d+e~DVV@KlH?q(tHZts!
z%Le+62v&^s6?xu;g)yN5M|%Iok#p#X5~X~n&XYkG$e{~=aflb0{2v{
z;ivYm5&7{?5&4NCa+xA>`TrAQ!$+_8|GYxJDWYe-vt5CyncOG%R&~68?o}(hYIbYq+Glyd`dXvzF9o
zCGvfjV{ot(FRW%snWAAOIiexKYOZ)EtNt93LVW6-S~8GJui4W0s>(-c^XF2MfGC1c
zv^QgEm39tQ_RCn=()d`l1rss?&&9^5L1Hf2iA54#lfD4~e~shI%FW!POCL6&NP(aG
zxn*r7aV|T`rpaQ+IqVWkmBmFg_I?TnSpwGpoAkUaiEEng4r>_xID4dEm#;((e^-oP
z)qK1Nu|F&q5ZU-;S}8hBtUm$pFr&%PVu-dXb)>N4kK9*zc`FvL9F6J=x;$d;wT&x4Os)D
zQ4oVTRv3c-`sRBi<5-};WRwe=j9l1c5%m2q#yh|qJu2^{#LbqgHe0<@zpE40sD_A3yC>|0DqupA?
z`E{mPuFMe<*MJ?9bNm9=yrk?Ss)-nUO=uvKWIf~zUnbs1zCMfK*Ti_gq+EPtwv!F8
zsskd(f07N6v*HQ*NPH-o4H89NFCeZDDV*);O&(a5q_Rq_-%4
zbbE_sIudzYPeoerawA*$qp9{^23%{5YWOK9+tBQ3`)|>;I5P_-T{|3^d25PBX1DOj
ztoIkh_JxQtC_4mYa!__8+)n?7TLjx#cFBF^jTBzCt4zUMF}6!~lie{a1KD`lW6|0u
z-qWkPHm*f4-+nyp&g+J}`+q$R{|VGPcgEV!`H(&sbHNhWud*+4k~PM!rD;Mawt~%+
z{lp9`g>`JQpKQ%Gu=`|xIRNMB9yU}CM9%p6Du);ant?)1Immk>C%aS&N8W?Kj5Q1g
ze6TlVTWPo#Ef|tJeqE+)NT&(b4@+jKZ@~zDS`I@_u{8dze;TmYuwsVenr3hF1#*Pv
zuCE;!iEnEA*#jb5j`Z5BkLA(csP*kQey5dF*4w+A^v~hcla{rHYA`-
znT>UkcGy@C>C}zYd4Z{^XzD0$?ZzI_qtR0C`-|zvrwho@B7l!Y|IJ$#NT;E6x|g(R
zLnmqvL9+-)9KXeS`EA`IEIh_fTNDb9rKcdhP|0yJV+a%Ja=fTVq#|zK=hfNVkx%d@
zZH|Uayr1ZKn}_mA-sR1moXL1U1s}7mwhRkQ!bb?cnc{zuCU~p1)aO(EAO}$*Yvqqy
zc=R-ET8Xa{_4y4s9c!CrIr&hPrHhB<{a)nOO8jr6<2-;m56XwU4qK1NhvjrHYFp*z
zGZ0-A=`i+$(DD(C1o>8mshg}GPNtg-Qysd_O5%hHJ2}(0ViqFK_U3LIQT9>aN|%-K
zM~q 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;