From 357aea532ea8379dc7ff475c0eace90f4fdf6dcd Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Thu, 21 Mar 2024 10:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=9D=E5=B7=A5=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PromotionImageController.java  | 19 +++++++++++++++++++
 .../system/interceptor/AdminWebConfig.java    |  3 ++-
 .../system/interceptor/LoginInterceptor.java  |  1 +
 .../admin/system/util/MD5Util.java            |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/PromotionImageController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/PromotionImageController.java
index 745064e..20a0f29 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/PromotionImageController.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/PromotionImageController.java
@@ -3,7 +3,9 @@ package com.chaozhanggui.admin.system.controller;
 
 import com.chaozhanggui.admin.system.service.PromotionImageService;
 import com.chaozhanggui.common.system.config.RespBody;
+import com.chaozhanggui.dao.system.dao.TbPlussUserAppMapper;
 import com.chaozhanggui.dao.system.entity.TbPlussAppGuide;
+import com.chaozhanggui.dao.system.entity.TbPlussUserApp;
 import com.dianguang.cloud.ossservice.config.CloudStorageConfig;
 import com.dianguang.cloud.ossservice.service.OSSFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +42,8 @@ public class PromotionImageController {
     private PromotionImageService promotionImageService;
     @Autowired
     CloudStorageConfig config;
+    @Resource
+    private TbPlussUserAppMapper userAppMapper;
 
     /**
      * 列表
@@ -165,6 +169,21 @@ public class PromotionImageController {
         return new RespBody("000000","success");
     }
 
+    @GetMapping("/merchantCode")
+    public RespBody getMerchantCodeByUserId(@RequestParam Integer userId){
+        if (userId != null ){
+            TbPlussUserApp tbPlussUserApp = userAppMapper.selectByUserId(userId);
+            if (tbPlussUserApp != null){
+                HashMap<String, String> map = new HashMap<>();
+                map.put("merchantCode",tbPlussUserApp.getMerchantcode());
+                return new RespBody("000000",map);
+            }
+            return new RespBody("999943");
+        }
+        return new RespBody("999943");
+    }
+
+
 
 
 }
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java
index 254cc69..54b4a97 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java
@@ -22,6 +22,7 @@ public class AdminWebConfig implements WebMvcConfigurer {
         registry.addInterceptor(new LoginInterceptor(redisUtil))
                 .addPathPatterns()
 //       如果有静态资源的时候可以在这个地方放行
-                .excludePathPatterns("/","/user/doLogin","/agency/mytest","/agency/queryAgency","/promotion/testRequest","/promotion/testRequestBoolean","/promotion/testSuccess","/agency/sendmessage","/Alipay/pay");
+                .excludePathPatterns("/","/user/doLogin","/agency/mytest","/agency/queryAgency","/promotion/testRequest","/promotion/testRequestBoolean","/promotion/testSuccess","/agency/sendmessage",
+                        "/Alipay/pay","/promotion/merchantCode");
     }
 }
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/LoginInterceptor.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/LoginInterceptor.java
index d7c1dd7..f2b4be9 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/LoginInterceptor.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/LoginInterceptor.java
@@ -44,6 +44,7 @@ public class LoginInterceptor implements HandlerInterceptor {
                 ||"/admin/notifyCallback/authUser".equals(requestURI)
                 ||"/admin/notifyCallback/createStore".equals(requestURI)
                 ||"/admin/notifyCallback/modifySettle".equals(requestURI)
+                ||"/admin/promotion/merchantCode".equals(requestURI)
         ){
             return true;
         }
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/MD5Util.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/MD5Util.java
index 65b1d35..629e36f 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/MD5Util.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/MD5Util.java
@@ -3,7 +3,7 @@ package com.chaozhanggui.admin.system.util;
 import java.security.MessageDigest;
 
 public class MD5Util {
-	private static String byteArrayToHexString(byte b[]) {  
+    private static String byteArrayToHexString(byte b[]) {
         StringBuffer resultSb = new StringBuffer();  
         for (int i = 0; i < b.length; i++)  
             resultSb.append(byteToHexString(b[i]));