From b5984f2e01e46861687a09a88e72f34dc9a7f154 Mon Sep 17 00:00:00 2001
From: wangff <feifan.wang@hao168.com>
Date: Thu, 18 Sep 2025 14:22:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=8E=B7=E5=8F=96=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=94=B6=E8=B4=A7=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/StoreMapper.xml |  4 ++++
 .../java/com/cool/store/dto/StoreDTO.java     |  9 +++++++++
 .../java/com/cool/store/entity/StoreDO.java   | 20 +++++++++++++++++++
 .../store/service/impl/StoreServiceImpl.java  | 12 ++---------
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index 3f87a8fa4..b66d43b1a 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -45,6 +45,10 @@
         <result column="store_type" property="storeType" jdbcType="TINYINT"/>
         <result column="mini_program_order_store_name" property="miniProgramOrderStoreName"/>
         <result column="is_iot" property="isIot" jdbcType="TINYINT"/>
+        <result column="addressee_name" property="addresseeName" jdbcType="VARCHAR"/>
+        <result column="addressee_mobile" property="addresseeMobile" jdbcType="VARCHAR"/>
+        <result column="addressee_area" property="addresseeArea" jdbcType="VARCHAR"/>
+        <result column="addressee_address" property="addresseeAddress" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="getByStoreId" resultMap="BaseResultMap">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
index 0c88ae388..c986b230a 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
@@ -43,4 +43,13 @@ public class StoreDTO {
     private String longitude;
 
     private String latitude;
+
+    @ApiModelProperty("订货人")
+    private String addresseeName;
+    @ApiModelProperty("手机号")
+    private String addresseeMobile;
+    @ApiModelProperty("收件省市区")
+    private String addresseeArea;
+    @ApiModelProperty("订货地址")
+    private String addresseeAddress;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
index 9e415969f..eaa972e41 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
@@ -242,4 +242,24 @@ public class StoreDO {
      * 是否接入物联网
      */
     private Integer isIot;
+
+    /**
+     * 收件人
+     */
+    private String addresseeName;
+
+    /**
+     * 手机号
+     */
+    private String addresseeMobile;
+
+    /**
+     * 收件省市区
+     */
+    private String addresseeArea;
+
+    /**
+     * 收件详细地址
+     */
+    private String addresseeAddress;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
index fdea618db..86cd44ad9 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
@@ -1,5 +1,6 @@
 package com.cool.store.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -362,22 +363,13 @@ public class StoreServiceImpl implements StoreService {
     public static List<StoreDTO> processStores(List<StoreDO> stores) {
         // 处理每个门店
         return stores.stream().map(store -> {
-            StoreDTO dto = new StoreDTO();
-            dto.setStoreName(store.getStoreName());
+            StoreDTO dto = BeanUtil.toBean(store, StoreDTO.class);
             dto.setStoreCode(store.getStoreNum());
-            dto.setStoreAddress(store.getStoreAddress());
             dto.setStoreAvatar(store.getAvatar());
-            dto.setTelephone(store.getTelephone());
-            dto.setMonthlyRent(store.getMonthlyRent());
-            dto.setMonthlyPersonnelSalary(store.getMonthlyPersonnelSalary());
-            dto.setMonthlyOtherExpenses(store.getMonthlyOtherExpenses());
-            dto.setUnifiedManagement(store.getUnifiedManagement());
             dto.setStoreType(StoreTypeEnum.getMessage(store.getStoreType()));
             dto.setJoinMode(JoinModeEnum.getByCode(store.getJoinModel()));
             dto.setBrand(FranchiseBrandEnum.getDescByCode(store.getJoinBrand()));
             dto.setOrderMiniProgramName(store.getMiniProgramOrderStoreName());
-            dto.setLongitude(store.getLongitude());
-            dto.setLatitude(store.getLatitude());
             return dto;
         }).collect(Collectors.toList());
     }