From 879f4307bd8a9ef0871fbcb429fb01c302a3d678 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 May 2024 09:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=95=86=E5=AE=B6=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E5=8F=8A=E6=89=80=E5=B1=9E=E5=9C=B0=E5=8C=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/HomeVO.java           | 8 ++++++++
 .../system/cashierservice/entity/vo/ShopGroupInfoVo.java  | 1 +
 .../system/cashierservice/service/ProductService.java     | 1 +
 src/main/resources/mapper/TbProductMapper.xml             | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeVO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeVO.java
index 033cfcb..d770df2 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeVO.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeVO.java
@@ -59,6 +59,7 @@ public class HomeVO {
      * 距离
      */
     private String distances ="100";
+    private String districts;
 
     private Integer id;
     /**
@@ -122,6 +123,13 @@ public class HomeVO {
         this.shopName = shopName;
     }
 
+    public String getDistricts() {
+        return districts;
+    }
+
+    public void setDistricts(String districts) {
+        this.districts = districts;
+    }
 
     public String getProductName() {
         return productName;
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ShopGroupInfoVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ShopGroupInfoVo.java
index aa13629..3adef0a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ShopGroupInfoVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ShopGroupInfoVo.java
@@ -29,6 +29,7 @@ public class ShopGroupInfoVo {
     private Integer number;
 
     private String address;
+    private String districts;
 
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 4458dc6..744c032 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -194,6 +194,7 @@ public class ProductService {
             homeVO.setId(o.getProId());
             homeVO.setShopName(o.getShopName());
             homeVO.setShopImage(o.getShopImg());
+            homeVO.setDistricts(o.getDistricts());
             if (StringUtils.isBlank(o.getShopTag())) {
                 homeVO.setShopTag(new ArrayList<>());
             } else {
diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 428ef66..b275b2c 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -949,6 +949,7 @@
       info.tag AS shopTag,
       info.lat AS lat,
       info.lng AS lng,
+      info.districts as districts,
       pro.id AS proId,
       pro.`name` AS proName,
       pro.cover_img AS proImg,
@@ -992,6 +993,7 @@
     info.tag AS shopTag,
     info.lat AS lat,
     info.lng AS lng,
+    info.districts as districts,
     pro.id AS proId,
     pro.`name` AS proName,
     pro.cover_img AS proImg,