Merge branch 'cc_20250805_store' into 'master'
Cc 20250805 store See merge request hangzhou/java/custom_zxjp!141
This commit is contained in:
@@ -3,6 +3,8 @@ package com.cool.store.dto;
|
|||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author suzhuhong
|
* @Author suzhuhong
|
||||||
* @Date 2025/5/13 10:56
|
* @Date 2025/5/13 10:56
|
||||||
@@ -33,5 +35,17 @@ public class StoreDTO {
|
|||||||
private String storeType;
|
private String storeType;
|
||||||
@ApiModelProperty("品牌")
|
@ApiModelProperty("品牌")
|
||||||
private String brand;
|
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 monthlyOtherExpenses;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -353,7 +353,9 @@ public class StoreServiceImpl implements StoreService {
|
|||||||
StoreDTO dto = new StoreDTO();
|
StoreDTO dto = new StoreDTO();
|
||||||
dto.setStoreName(store.getStoreName());
|
dto.setStoreName(store.getStoreName());
|
||||||
dto.setStoreCode(store.getStoreNum());
|
dto.setStoreCode(store.getStoreNum());
|
||||||
|
dto.setStoreAddress(store.getStoreAddress());
|
||||||
|
dto.setStoreAvatar(store.getAvatar());
|
||||||
|
dto.setTelephone(store.getTelephone());
|
||||||
try {
|
try {
|
||||||
// 解析门店的扩展字段
|
// 解析门店的扩展字段
|
||||||
Map<String, String> extendFields = objectMapper.readValue(
|
Map<String, String> extendFields = objectMapper.readValue(
|
||||||
|
|||||||
Reference in New Issue
Block a user