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

feat:xxl

Browse Source
This commit is contained in:
苏竹红
2025-05-08 21:50:57 +08:00
parent 251e8e8f6c
commit b96f00d1f2
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -114,14 +114,14 @@ public class BuildInformationServiceImpl implements BuildInformationService {
response.setXgjVicePresident(user.getName()); response.setXgjVicePresident(user.getName());
} }
} }
if (Objects.nonNull(pointInfo)) { if (Objects.nonNull(pointInfo)) {
if (StringUtils.isBlank(response.getAddresseeProvince())){ if (StringUtils.isBlank(response.getAddresseeProvince())){
response.setAddresseeProvince(pointInfo.getProvince());} response.setAddresseeProvince(pointInfo.getProvince());}
if (StringUtils.isBlank(response.getAddresseeCity())){ if (StringUtils.isBlank(response.getAddresseeCity())){
response.setAddresseeCity(pointInfo.getCity());} response.setAddresseeCity(pointInfo.getCity());}
if (StringUtils.isBlank(response.getAddresseeDistrict())){ if (StringUtils.isBlank(response.getAddresseeDistrict())){
response.setAddresseeDistrict(pointInfo.getDistrict());} response.setAddresseeDistrict(pointInfo.getDistrict());}
} }
if (StringUtils.isBlank(response.getAddresseeAddress())){ if (StringUtils.isBlank(response.getAddresseeAddress())){
response.setAddresseeAddress(shopInfo.getDetailAddress());} response.setAddresseeAddress(shopInfo.getDetailAddress());}

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

@@ -399,6 +399,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopAuditInfoMapper.insertSelective(shopAuditInfoDO); shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
Long auditId = shopAuditInfoDO.getId(); Long auditId = shopAuditInfoDO.getId();
shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum, auditId); shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum, auditId);
signFranchiseMapper.updateAuditByShopId(auditId, shopId);
//审批记录表记录 //审批记录表记录
List<OperationLogDO> operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, OperationTypeEnum.OPERATION_TYPE_1.getCode()); List<OperationLogDO> operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, OperationTypeEnum.OPERATION_TYPE_1.getCode());
operationLogService.batchUpdateProcessed(operationLogs, auditId, user.getUserId(), request.getCause()); operationLogService.batchUpdateProcessed(operationLogs, auditId, user.getUserId(), request.getCause());

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
View File

@@ -29,7 +29,7 @@ public class PCSignFranchiseController {
return signFranchiseService.submitSignFranchise(request,user); return signFranchiseService.submitSignFranchise(request,user);
} }
@ApiOperation("提交(更新)加盟合同签约") @ApiOperation("重新提交加盟合同签约")
@PostMapping("/reSubmitSignFranchise") @PostMapping("/reSubmitSignFranchise")
public ResponseResult<Boolean> reSubmitSignFranchise(@RequestBody @Validated AddSignFranchiseRequest request) { public ResponseResult<Boolean> reSubmitSignFranchise(@RequestBody @Validated AddSignFranchiseRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser(); LoginUserInfo user = CurrentUserHolder.getUser();