From b937c1c0ec42583e70d066385b7b5cca855cd040 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Fri, 23 Feb 2024 16:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E6=9B=B4=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MerchantChannelStatusService.java | 26 +++++--------------
 .../mapper/TbPlussMerchantBaseInfoMapper.xml  |  2 +-
 .../merchant/service/ys/YSAuditServiceV3.java |  7 +++--
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
index 777d0b6..a8b8b5d 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
@@ -213,9 +213,9 @@ public class MerchantChannelStatusService {
         //D1(已完成)
         List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D1");
 
-        if (channelD1.size()>1){
-            return new RespBody("000087");
-        }
+//        if (channelD1.size()>1){
+//            return new RespBody("000087");
+//        }
         if (channelD1.size() != 0) {
             HashMap<String, Object> d1 = new HashMap<>();
             //审核备注
@@ -226,23 +226,9 @@ public class MerchantChannelStatusService {
             d1.put("thirdStatus",channelD1.get(0).getThirdstatus());
             //汇付
             Integer channel = channelD1.get(0).getChannel();
-            if (channel==7){
-                TbPlussMerchantHfInfo findMerchantHfInfo = merchantHfInfoMapper.selectByMerchantCode(tbPlussMerchantBaseInfo.getMerchantcode());
-                JSONObject jsonObject = JSON.parseObject(findMerchantHfInfo.getWxInfo());
-                if (jsonObject == null){
-                    d1.put("wxLiteAppId","");
-                    d1.put("wxPubAppId","");
-                    d1.put("wxPubPath","");
-                }else {
-                    d1.put("wxLiteAppId", jsonObject.get("wxLiteAppld"));
-                    d1.put("wxPubAppId", jsonObject.get("wxPubAppld"));
-                    d1.put("wxPubPath", jsonObject.get("wxPubPath"));
-                }
-            }else {
-                d1.put("wxLiteAppId","");
-                d1.put("wxPubAppId","");
-                d1.put("wxPubPath","");
-            }
+            d1.put("wxLiteAppId","");
+            d1.put("wxPubAppId","");
+            d1.put("wxPubPath","");
             merchantChannelMessage.add(d1);
         }
 
diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
index bf6a0e2..351a2f6 100644
--- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
+++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
@@ -633,7 +633,7 @@
       tb_pluss_merchant_base_info a
         LEFT JOIN tb_pluss_merchant_base_info b ON a.masterMerchantCode = b.merchantCode
     WHERE
-      a.masterMerchantCode IS NOT NULL
+      a.masterMerchantCode IS NOT NULL AND a.masterMerchantCode <![CDATA[ <> ]]>''
   </select>
 
 </mapper>
\ No newline at end of file
diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java
index ee94fda..0f7f6b7 100644
--- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java
+++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java
@@ -316,11 +316,13 @@ public class YSAuditServiceV3 {
         TbPlussMerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.selectByUserId(userId);
         //如果是小微则用商户简称
         if ("1".equals(merchantBaseInfo.getMerchanttype())) {
-            custInfo.setMercName(merchantBaseInfo.getAlias());
+            custInfo.setMercName(merchantBaseInfo.getCity()+merchantBaseInfo.getAlias());
+            custInfo.setMercShortName(merchantBaseInfo.getCity()+merchantBaseInfo.getAlias());
         }else {
             custInfo.setMercName(merchantBaseInfo.getMerchantname());
+            custInfo.setMercShortName(merchantBaseInfo.getAlias());
         }
-        custInfo.setMercShortName(merchantBaseInfo.getAlias());
+
         //对应商户类型
         switch (merchantBaseInfo.getMerchanttype()) {
             case MERCH_TYPE_MICRO:
@@ -761,6 +763,7 @@ public class YSAuditServiceV3 {
         try {
             ReqEntity request = ReqEntity.get(reqMethod);
             Sign sign = null;
+            log.info("+++++++++++++"+ysConfig.getSrcMerchantNo());
             if (channel.equals(4)) {
                 request.setCertId(ysConfig.getSrcMerchantNo());
                 RSA rsa = SecureUtil.rsa(ysConfig.getPriKey(), ysConfig.getOldPubKey());