feat:storeId
This commit is contained in:
@@ -308,7 +308,8 @@
|
|||||||
a.franchise_brand as franchiseBrand,
|
a.franchise_brand as franchiseBrand,
|
||||||
a.shop_status as shopStatus,
|
a.shop_status as shopStatus,
|
||||||
a.detail_address as shopAddress,
|
a.detail_address as shopAddress,
|
||||||
a.manager_region_id as managerRegionId
|
a.manager_region_id as managerRegionId,
|
||||||
|
a.store_id as storeId
|
||||||
from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id
|
from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id
|
||||||
<if test="request.contractStartTime !=null and request.contractEndTime != null">
|
<if test="request.contractStartTime !=null and request.contractEndTime != null">
|
||||||
left join xfsg_sign_franchise c on a.id = c.shop_id
|
left join xfsg_sign_franchise c on a.id = c.shop_id
|
||||||
|
|||||||
@@ -55,5 +55,7 @@ public class PreparationDTO {
|
|||||||
|
|
||||||
private Long managerRegionId;
|
private Long managerRegionId;
|
||||||
|
|
||||||
|
private String storeId;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ public class BranchShopResponse {
|
|||||||
@ApiModelProperty("所属管理区域name")
|
@ApiModelProperty("所属管理区域name")
|
||||||
private String managerRegionName;
|
private String managerRegionName;
|
||||||
|
|
||||||
|
private String storeId;
|
||||||
|
|
||||||
|
|
||||||
public void setDays() {
|
public void setDays() {
|
||||||
if (this.openingActivityEndTime==null){
|
if (this.openingActivityEndTime==null){
|
||||||
|
|||||||
@@ -563,6 +563,7 @@ public class ShopServiceImpl implements ShopService {
|
|||||||
response.setLineId(dto.getLineId());
|
response.setLineId(dto.getLineId());
|
||||||
response.setUsername(dto.getUsername());
|
response.setUsername(dto.getUsername());
|
||||||
response.setMobile(dto.getMobile());
|
response.setMobile(dto.getMobile());
|
||||||
|
response.setStoreId(dto.getStoreId());
|
||||||
response.setShopName(dto.getShopName());
|
response.setShopName(dto.getShopName());
|
||||||
response.setShopCode(dto.getShopCode());
|
response.setShopCode(dto.getShopCode());
|
||||||
response.setRegionName(regionNameMap.getOrDefault(dto.getRegionId(), ""));
|
response.setRegionName(regionNameMap.getOrDefault(dto.getRegionId(), ""));
|
||||||
|
|||||||
Reference in New Issue
Block a user