suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-15 16:03:02 +08:00
parent e1f8cf749e f131112a26
commit 9032c6c60d
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java
View File

@@ -101,6 +101,8 @@ public class SystemBuildingShopDO {
private Date updateTime;
@Column(name = "store_name")
private String storeName;
@Column(name = "usage_rate")
private String usageRate;
@@ -180,6 +182,8 @@ public class SystemBuildingShopDO {
systemBuildingShopDO.setFightName(sysStoreAppRequest.getStoreDetail().getFightName());
systemBuildingShopDO.setFightCode(sysStoreAppRequest.getStoreDetail().getFightCode());
systemBuildingShopDO.setSmallName(sysStoreAppRequest.getStoreDetail().getSmallName());
systemBuildingShopDO.setUsageRate(sysStoreAppRequest.getStoreDetail().getUsageRate());
systemBuildingShopDO.setStoreOperator(sysStoreAppRequest.getStoreDetail().getStoreOperator());
return systemBuildingShopDO;
}
}

2
coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java
View File

@@ -161,6 +161,8 @@ public class SysStoreAppResponse {
private String township;
@ApiModelProperty("详细地址")
private String detailAddress;
@ApiModelProperty("品牌使用费率")
private String usageRate;
}

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
// smallDesc
storeDetail.setSmallDesc(systemBuildingShopDO.getSmallDesc());
// smallName
storeDetail.setSmallName(systemBuildingShopDO.getSmallDesc());
storeDetail.setSmallName(systemBuildingShopDO.getSmallName());
// mainBusinessType
storeDetail.setMainBusinessType(systemBuildingShopDO.getMainBusinessType());
// subBusinessType
@@ -222,6 +222,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
storeDetail.setStoreSecurityDeposit(systemBuildingShopDO.getStoreSecurityDeposit());
// reasons
storeDetail.setReasons(systemBuildingShopDO.getReasons());
storeDetail.setUsageRate(systemBuildingShopDO.getUsageRate());
}
if (Objects.nonNull(lineInfoDO)) {
RegionDO byRegionId = regionMapper.getByRegionId(lineInfoDO.getRegionId());