From 2b45e77a37260226c6b2f87baa940918d58801e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Fri, 23 Feb 2024 17:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E4=BB=98=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/controller/OpenNessController.java       | 8 ++++----
 .../com/chaozhanggui/merchant/service/HfMerService.java   | 8 ++++++--
 .../chaozhanggui/merchant/service/MerchantService.java    | 1 -
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/OpenNessController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/OpenNessController.java
index ca8b575..8bfbe0f 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/OpenNessController.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/OpenNessController.java
@@ -153,9 +153,9 @@ public class OpenNessController {
 
         JSONObject object=new JSONObject();
         object.put("merchantCode",baseInfo.getMerchantcode());
-//        for(String key:map.keySet()){
-//            object.put(key,map.get(key));
-//        }
+        for(String key:map.keySet()){
+            object.put(key,map.get(key));
+        }
         HttpEntity<String>  body = new HttpEntity<String>(object.toString(),headers);
 
         ResponseEntity<String> response= restTemplate.postForEntity(apiurl.concat("/order/queryOrder"),body,String.class);
@@ -189,7 +189,7 @@ public class OpenNessController {
         object.put("contactsName",baseInfo.getContactname());
         object.put("contactsPhone",baseInfo.getContactmobile());
         object.put("contactsEmail",baseInfo.getEmail());
-        object.put("mccCode",baseInfo.getMcc());
+        object.put("mccCode",baseInfo.getMccname());
         object.put("provinceCode",baseInfo.getProvinceCode());
         object.put("provinceName",baseInfo.getProvince());
         object.put("cityCode",baseInfo.getCityCode());
diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
index 7688094..7dce32b 100644
--- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
+++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
@@ -1880,6 +1880,8 @@ public class HfMerService {
 
         request.put("accountOpeningPermitId", map.get("accountOpeningPermitId"));//开户许可证图片
 
+
+
         Map<String, Object> merchantResident = null;
         try {
             merchantResident = MerchantResident.auditProfileInfo(request);
@@ -2552,14 +2554,14 @@ public class HfMerService {
                 Map<String, Object> f = HfMerService.fileUpload(idCard.getImgpositive(), "03", record.getMerchantid());
 
                 if (ObjectUtil.isNotEmpty(f) && "succeeded".equals(f.get("status"))) {
-                    map.put("legalCertIdBackId", f.get("pic_id"));
+                    map.put("legalCertIdFrontId", f.get("pic_id"));
                 }
 
 
                 Map<String, Object> z = HfMerService.fileUpload(idCard.getImgnegative(), "02", record.getMerchantid());
 
                 if (ObjectUtil.isNotEmpty(z) && "succeeded".equals(z.get("status"))) {
-                    map.put("legalCertIdFrontId", z.get("pic_id"));
+                    map.put("legalCertIdBackId", z.get("pic_id"));
                 }
 
                 Map<String, Object> cz = null;
@@ -2579,6 +2581,8 @@ public class HfMerService {
 
                     cz = HfMerService.fileUpload(bankCard.getLicenseurl(), "05", record.getMerchantid());
                     yyzz = HfMerService.fileUpload(image.getPicurl(), "01", record.getMerchantid());
+                }else {
+                    cz = HfMerService.fileUpload(bankCard.getImgurl(), "05", record.getMerchantid());
                 }
 
 
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 2dfcf89..8e7823b 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
@@ -1,7 +1,6 @@
 package com.chaozhanggui.merchant.service;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.chaozhanggui.common.system.config.MsgException;
 import com.chaozhanggui.dao.system.dao.*;
 import com.chaozhanggui.dao.system.entity.*;