From 247a7091695fa9aca1def0fb696bf6c6cc1f11ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 5 Aug 2025 11:56:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E9=97=A8=E5=BA=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dto/StoreDTO.java | 14 ++++++++++++++ .../cool/store/service/impl/StoreServiceImpl.java | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) 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 876ac8795..0c290f15b 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 @@ -3,6 +3,8 @@ package com.cool.store.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @Author suzhuhong * @Date 2025/5/13 10:56 @@ -33,5 +35,17 @@ public class StoreDTO { private String storeType; @ApiModelProperty("品牌") private String brand; + @ApiModelProperty("门店地址") + private String storeAddress; + @ApiModelProperty("门店联系方式") + private String telephone; + @ApiModelProperty("门头照") + private String storeAvatar; + @ApiModelProperty("月租金") + private BigDecimal monthlyRent; + @ApiModelProperty("月人员工资") + private BigDecimal monthlyPersonnelSalary; + @ApiModelProperty("月水电费") + private BigDecimal MonthlyExpenses; } 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 7ef642edd..32d445fad 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 @@ -353,7 +353,9 @@ public class StoreServiceImpl implements StoreService { StoreDTO dto = new StoreDTO(); dto.setStoreName(store.getStoreName()); dto.setStoreCode(store.getStoreNum()); - + dto.setStoreAddress(store.getStoreAddress()); + dto.setStoreAvatar(store.getAvatar()); + dto.setTelephone(store.getTelephone()); try { // 解析门店的扩展字段 Map extendFields = objectMapper.readValue( From 62e7aafd725d51b95d0628f19181ffcd30355873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 5 Aug 2025 12:00:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E9=97=A8=E5=BA=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dto/StoreDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0c290f15b..64e64ff6a 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 @@ -46,6 +46,6 @@ public class StoreDTO { @ApiModelProperty("月人员工资") private BigDecimal monthlyPersonnelSalary; @ApiModelProperty("月水电费") - private BigDecimal MonthlyExpenses; + private BigDecimal monthlyOtherExpenses; }