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

Merge branch 'cc_20250916_buildstore' into 'master'

Browse Source 
Cc 20250916 buildstore

See merge request hangzhou/java/custom_zxjp!160
This commit is contained in:
苏竹红
2025-09-17 09:56:15 +00:00
parent c4848695fa f491de1116
commit c68ae7a701
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java
View File

@@ -219,6 +219,8 @@ public class ZxjpApiRequest {
private Long shopId; private Long shopId;
@ApiModelProperty("合同编号")
private String contractCode;

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/MatterConfigServiceImpl.java
View File

@@ -56,8 +56,12 @@ public class MatterConfigServiceImpl implements MatterConfigService {
BeanUtils.copyProperties(request, matterConfigDO); BeanUtils.copyProperties(request, matterConfigDO);
matterConfigDO.setUpdateUserId(currentUser.getUserId()); matterConfigDO.setUpdateUserId(currentUser.getUserId());
matterConfigDO.setUpdateTime(new Date()); matterConfigDO.setUpdateTime(new Date());
matterConfigDO.setDefaultStoreInfo(JSONObject.toJSONString(request.getStoreInfoList())); if (CollectionUtils.isNotEmpty(request.getStoreInfoList())){
matterConfigDO.setDefaultHandlePersonInfo(JSONObject.toJSONString(request.getUserInfoList())); matterConfigDO.setDefaultStoreInfo(JSONObject.toJSONString(request.getStoreInfoList()));
}
if (CollectionUtils.isNotEmpty(request.getUserInfoList())){
matterConfigDO.setDefaultHandlePersonInfo(JSONObject.toJSONString(request.getUserInfoList()));
}
return matterConfigDAO.updateForce(matterConfigDO); return matterConfigDAO.updateForce(matterConfigDO);
} }

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -119,6 +119,7 @@ public class SyncDataServiceImpl implements SyncDataService {
} }
request.setPartnershipSignatory(partnershipSignatory); request.setPartnershipSignatory(partnershipSignatory);
request.setBusinessModel(signFranchiseDO.getBusinessModel()); request.setBusinessModel(signFranchiseDO.getBusinessModel());
request.setContractCode(signFranchiseDO.getContractCode());
} }
request.setPartnerMobile(lineInfoDO.getMobile()); request.setPartnerMobile(lineInfoDO.getMobile());
request.setShopCode(shopInfo.getShopCode()); request.setShopCode(shopInfo.getShopCode());