汇付后台显示追加提交

newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java

@@ -134,7 +134,7 @@ public class MerchantChannelStatusController {
      * 后台进件/驳回
      * @param userId
      * @param channelId
-     * @param merchantCode
+     * @param
      * @return
      */
     @GetMapping(value = "/manualMerchantIncom")

newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java

@@ -1,6 +1,8 @@
 package com.chaozhanggui.admin.system.service;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.common.system.config.RespBody;
 import com.chaozhanggui.dao.system.dao.*;
 import com.chaozhanggui.dao.system.entity.*;
@@ -104,6 +106,8 @@ public class MerchantChannelStatusService {
     private TbPlussOperationRecordMapper operationRecordMapper;
     @Resource
     private TbPlussMerchantBaseInfoMapper merchantBaseInfoMapper;
+    @Resource
+    private TbPlussMerchantHfInfoMapper merchantHfInfoMapper;
 
 //    /**
 //     * 后台进件
@@ -208,6 +212,7 @@ public class MerchantChannelStatusService {
         List<HashMap> merchantChannelMessage = new ArrayList<>();
         //D1(已完成)
         List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D1");
+
         if (channelD1.size()>1){
             return new RespBody("000087");
         }
@@ -219,6 +224,25 @@ public class MerchantChannelStatusService {
             d1.put("channel",channelD1.get(0).getChannel());
             d1.put("valid",account == null? null:account.getChanneltype());
             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("wxLiteAppld","");
+                    d1.put("wxPubAppld","");
+                    d1.put("wxPubPath","");
+                }else {
+                    d1.put("wxLiteAppld", jsonObject.get("wxLiteAppld"));
+                    d1.put("wxPubAppld", jsonObject.get("wxPubAppld"));
+                    d1.put("wxPubPath", jsonObject.get("wxPubPath"));
+                }
+            }else {
+                d1.put("wxLiteAppld","");
+                d1.put("wxPubAppld","");
+                d1.put("wxPubPath","");
+            }
             merchantChannelMessage.add(d1);
         }
 
@@ -251,6 +275,9 @@ public class MerchantChannelStatusService {
             unaudited.put("channel",channel.get(0).getChannel());
             unaudited.put("valid",account == null? null:account.getChanneltype());
             unaudited.put("thirdStatus",channel.get(0).getThirdstatus());
+            unaudited.put("wxLiteAppld","");
+            unaudited.put("wxPubAppld","");
+            unaudited.put("wxPubPath","");
             merchantChannelMessage.add(unaudited);
         }
         channelMap.put("merchantChannelMessage",merchantChannelMessage);