From c04d8faabd34f64c396f18c4211df4418d28a3dd Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 1 Nov 2024 10:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A5=A8logo=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/dao/TbShopInfoMapper.java  |  2 ++
 .../system/cashierservice/entity/TbShopInfo.java     |  2 ++
 .../cashierservice/interceptor/SignInterceptor.java  |  4 ++++
 .../cashierservice/service/ShopInfoService.java      |  8 +++++++-
 src/main/resources/mapper/TbShopInfoMapper.xml       | 12 ++++++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java
index dcff0da..e262916 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java
@@ -12,5 +12,7 @@ public interface TbShopInfoMapper {
     List<TbShopInfo> selectAllByCreateTime();
 
 
+    String getTicketLogo(Integer shopId);
+
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
index a48b85b..94181ee 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
@@ -262,5 +262,7 @@ public class TbShopInfo implements Serializable {
      * 店铺收款码
      */
     private String paymentQrcode;
+
+    private String ticketLogo = "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20241022/eeee8e85c66947e5bcaebf687381b5d6.png";
 }
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java b/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java
index a908a8a..965daf6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java
@@ -41,6 +41,10 @@ public class SignInterceptor implements HandlerInterceptor {
             return true;
         }
 
+        if (requestUri.contains("/shopInfo/queryShopInfo")) {
+            return true;
+        }
+
         if (requestUri.contains("/version/pcDownload")) {
             return true;
         }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
index b3f9fa6..d4b569d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
@@ -18,6 +18,7 @@ import com.chaozhanggui.system.cashierservice.util.PageHelperUtil;
 import com.chaozhanggui.system.cashierservice.util.TokenUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -55,7 +56,12 @@ public class ShopInfoService {
     }
 
     public Result queryShopInfo(Integer shopId) {
-        return new Result(CodeEnum.SUCCESS,tbShopInfoMapper.selectByPrimaryKey(shopId));
+        TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId);
+        String ticketLogo = tbShopInfoMapper.getTicketLogo(shopId);
+        if(StringUtils.isNotBlank(ticketLogo)){
+            tbShopInfo.setTicketLogo(ticketLogo);
+        }
+        return new Result(CodeEnum.SUCCESS,tbShopInfo);
     }
 
     public Result queryShopArea(String shopId){
diff --git a/src/main/resources/mapper/TbShopInfoMapper.xml b/src/main/resources/mapper/TbShopInfoMapper.xml
index d82f9da..13f15c7 100644
--- a/src/main/resources/mapper/TbShopInfoMapper.xml
+++ b/src/main/resources/mapper/TbShopInfoMapper.xml
@@ -106,5 +106,17 @@
                 AND NOW());
     </select>
 
+
+  <select id="getTicketLogo" resultType="string">
+
+    SELECT
+      `value`
+    FROM
+        tb_shop_extend
+    WHERE
+        shop_id = #{shopId}
+    and autoKey = 'ticket_logo'
+  </select>
+
 </mapper>