From 5a146be7d9df1f8ae4e70d0129767d2857f57797 Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Thu, 23 Mar 2023 16:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=A0=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/impl/account/AccountServiceImpl.java    | 12 ++++++------
 .../controller/component/PayCallbackConsumer.java    |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

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 081a241..9ad09a9 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
@@ -379,12 +379,12 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
 
         boolean settleTypeFlag = Account.SETTLE_TYPE_CORPORATE.equals(accountDTO.getSettleType());
         //TODO 测试时先注掉
-//        if (checkFlag && !(settleTypeFlag)) {
-//            // 执行银行卡四要素校验
-//            aliyunService.checkBankCorrectNow(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo()
-//                    , accountDTO.getIdcard().getCertNo()
-//                    , accountDTO.getBankCard().getBankHolder(), "结算人与结算银行卡不匹配，请核对结算信息");
-//        }
+        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-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java
index 08d845c..ff7570c 100644
--- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java
@@ -38,7 +38,8 @@ public class PayCallbackConsumer {
             return;
         }
         if(!"1".equals(order.getOrderType())){
-            realFansService.createFansProfit(order);
+            //TODO 先将粉丝分润干掉，后面在进行打开
+           // realFansService.createFansProfit(order);
         }
         merchantProfitService.createOrderProfitV2(order,"1");
         MerchantOrder update = new MerchantOrder();