Merge branch 'cc_20250916_new' into 'master'
fix:添加门店mq消息新增省市区字段 See merge request hangzhou/java/custom_zxjp!170
This commit is contained in:
@@ -49,6 +49,12 @@ public class StoreMasterDTO {
|
|||||||
|
|
||||||
@ApiModelProperty("省市区")
|
@ApiModelProperty("省市区")
|
||||||
private String area;
|
private String area;
|
||||||
|
@ApiModelProperty("省")
|
||||||
|
private String province;
|
||||||
|
@ApiModelProperty("市")
|
||||||
|
private String city;
|
||||||
|
@ApiModelProperty("区/县")
|
||||||
|
private String district;
|
||||||
@ApiModelProperty("乡镇")
|
@ApiModelProperty("乡镇")
|
||||||
private String town;
|
private String town;
|
||||||
@ApiModelProperty("门店地址")
|
@ApiModelProperty("门店地址")
|
||||||
|
|||||||
@@ -160,6 +160,9 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
|
|||||||
PointDetailInfoDO pointDetail = pointDetailDAO.getPointDetailInfoByPointId(shopInfo.getPointId());
|
PointDetailInfoDO pointDetail = pointDetailDAO.getPointDetailInfoByPointId(shopInfo.getPointId());
|
||||||
if (info != null){
|
if (info != null){
|
||||||
storeMasterDTO.setArea(info.getProvince()+info.getCity()+info.getDistrict());
|
storeMasterDTO.setArea(info.getProvince()+info.getCity()+info.getDistrict());
|
||||||
|
storeMasterDTO.setProvince(info.getProvince());
|
||||||
|
storeMasterDTO.setCity(info.getCity());
|
||||||
|
storeMasterDTO.setDistrict(info.getDistrict());
|
||||||
storeMasterDTO.setTown(info.getTownship());
|
storeMasterDTO.setTown(info.getTownship());
|
||||||
storeMasterDTO.setStoreAddress(info.getAddress());
|
storeMasterDTO.setStoreAddress(info.getAddress());
|
||||||
storeMasterDTO.setLocationAddress(info.getAddress());
|
storeMasterDTO.setLocationAddress(info.getAddress());
|
||||||
|
|||||||
Reference in New Issue
Block a user