From bc21e05fd2070228812ba9d128a4af0003a5f0af Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Mon, 16 Oct 2023 14:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8F=90=E4=BA=A4=E5=88=B0?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=9B=B4=E6=94=B9=E8=B5=84=E6=96=99=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/MerchantInfoService.java   |  4 +-
 .../merchant/service/MerchantService.java     | 74 ++++++++++---------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java
index 2718cfd..93891ed 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java
@@ -303,8 +303,8 @@ public class MerchantInfoService {
         }
         bankCardMapper.updateByPrimaryKeySelective(account.getBankCard());
         idCardMapper.updateByPrimaryKeySelective(account.getIdcard());
-
-//        merchantService.updateMerchantBase(account.);
+        //三方
+        merchantService.updateMerchantBase(Integer.valueOf(account.getUserid()),account.getBankCard(),account.getIdcard());
         return new RespBody("000000");
 
     }
diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
index bdb36b6..556b5d4 100644
--- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
+++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
@@ -179,45 +179,47 @@ public class MerchantService {
      * 通用修改进件基本资料相关
      * @param userId
      */
-    public void updateMerchantBase(Integer userId, TbPlussBankCard bankCard,TbPlussIdCard idCard){
-        MsgException.checkNull(userId,"请选择用户");
-
+    public void updateMerchantBase(Integer userId, TbPlussBankCard bankCard,TbPlussIdCard idCard) {
         //获取用户信息
-        TbPlussUserInfo userInfo= tbPlussUserInfoMapper.selectByPrimaryKey(Long.valueOf(userId));
-        MsgException.checkNull(userInfo,"用户信息不存在");
-
-
-        //判断进件信息是否存在
-        TbPlussMerchantBaseInfo baseInfo= tbPlussMerchantBaseInfoMapper.selectByUserId(String.valueOf(userId));
-        MsgException.checkNull(baseInfo,"请完善进件信息");
-
-        //判断用户是否有进件
-        List<TbPlussMerchantChannelStatus> merchantCodes = tbPlussMerchantChannelStatusMapper.getByMerchantCodesAudit(baseInfo.getMerchantcode());
-        if (merchantCodes != null){
-            int size = merchantCodes.size();
-            if (size>2){
-                MsgException.throwException("用户进件信息有误");
-            }
-            if (size == 1){
-                Integer channel = merchantCodes.get(0).getChannel();
-
-                //不同的通道
-                switch (channel){
-                    case 1:
-                        sxfMerchantAuditService.updateMerchantIdCard(merchantCodes.get(0).getMerchantid(),bankCard,idCard);
-                        break;
-                    case 4:
-                        ysAuditServiceV3.updateMerchantBankCard(merchantCodes.get(0).getMerchantid(),idCard,bankCard,channel);
-                        ysAuditServiceV3.updateMerchantIdCard(merchantCodes.get(0).getMerchantid(),idCard,channel,userInfo);
-                        break;
-                    case 5:
-
-                    default:
-                        break;
+        TbPlussUserInfo userInfo = tbPlussUserInfoMapper.selectByPrimaryKey(Long.valueOf(userId));
+        if (userInfo != null) {
+            //判断进件信息是否存在
+            TbPlussMerchantBaseInfo baseInfo = tbPlussMerchantBaseInfoMapper.selectByUserId(String.valueOf(userId));
+            if (baseInfo != null) {
+                //判断用户是否有进件
+                List<TbPlussMerchantChannelStatus> merchantCodes = tbPlussMerchantChannelStatusMapper.getByMerchantCodesAudit(baseInfo.getMerchantcode());
+                if (merchantCodes != null) {
+                    int size = merchantCodes.size();
+                    if (size > 2) {
+                        MsgException.throwException("用户进件信息有误");
+                    }
+                    if (size == 1) {
+                        //一个通道
+                        updateChannel(merchantCodes.get(0).getChannel(), merchantCodes.get(0).getMerchantid(), bankCard,idCard,userInfo);
+                    }
+                    if (size == 2) {
+                        //两个通道
+                        updateChannel(merchantCodes.get(0).getChannel(), merchantCodes.get(0).getMerchantid(), bankCard,idCard,userInfo);
+                        updateChannel(merchantCodes.get(1).getChannel(), merchantCodes.get(1).getMerchantid(), bankCard,idCard,userInfo);
+                    }
                 }
             }
         }
-
     }
-
+    public void updateChannel(Integer channel,String MerchantId, TbPlussBankCard bankCard,
+                              TbPlussIdCard idCard, TbPlussUserInfo userInfo){
+            switch (channel) {
+                case 1:
+                    sxfMerchantAuditService.updateMerchantIdCard(MerchantId, bankCard, idCard);
+                    break;
+                case 4:
+                    ysAuditServiceV3.updateMerchantBankCard(MerchantId, idCard, bankCard, channel);
+                    ysAuditServiceV3.updateMerchantIdCard(MerchantId, idCard, channel, userInfo);
+                    break;
+                case 5:
+                    break;
+                default:
+                    break;
+            }
+    }
 }