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

fix

Browse Source
This commit is contained in:
guohb
2024-05-16 17:32:14 +08:00
parent f79aa9ba2e
commit 250bc80cd4
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
View File

@@ -5,9 +5,11 @@ import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.entity.*; import com.cool.store.entity.*;
import com.cool.store.enums.AuditTypeEnum; import com.cool.store.enums.AuditTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.MessageEnum; import com.cool.store.enums.MessageEnum;
import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.SMSMsgEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.*; import com.cool.store.mapper.*;
import com.cool.store.request.AuditFranchiseFeeRequest; import com.cool.store.request.AuditFranchiseFeeRequest;
import com.cool.store.request.FranchiseFeeRequest; import com.cool.store.request.FranchiseFeeRequest;
@@ -70,6 +72,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO(); FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
franchiseFeeDO.setShopId(shopId); franchiseFeeDO.setShopId(shopId);
FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO); FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO);
if (Objects.isNull(result)){
return new FranchiseFeeResponse();
}
FranchiseFeeResponse resp = FranchiseFeeResponse.from(result); FranchiseFeeResponse resp = FranchiseFeeResponse.from(result);
LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId()); LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId());
if (Objects.nonNull(linePayDO)) { if (Objects.nonNull(linePayDO)) {

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

@@ -153,19 +153,19 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区 RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区
RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区 RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区
EnterpriseUserDO regionManager = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId()); EnterpriseUserDO regionManager = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId());
EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, fightRegion.getId()); // EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, fightRegion.getId());
if (Objects.nonNull(regionManager)) { if (Objects.nonNull(regionManager)) {
// regioGeneral // regioGeneral
supervisorDetail.setRegioGeneral(regionManager.getName()); supervisorDetail.setRegioGeneral(regionManager.getName());
// regioGeneralId // regioGeneralId
supervisorDetail.setRegioGeneralId(regionManager.getUserId()); supervisorDetail.setRegioGeneralId(regionManager.getUserId());
} }
if (Objects.nonNull(supervisor)) { // if (Objects.nonNull(supervisor)) {
// supervisorName // // supervisorName
supervisorDetail.setSupervisorName(supervisor.getName()); // supervisorDetail.setSupervisorName(supervisor.getName());
// supervisorId // // supervisorId
supervisorDetail.setSupervisorId(supervisor.getUserId()); // supervisorDetail.setSupervisorId(supervisor.getUserId());
} // }
storeDetail.setBigName(bigRegion.getName()); storeDetail.setBigName(bigRegion.getName());
storeDetail.setBigCode(bigRegion.getSynDingDeptId()); storeDetail.setBigCode(bigRegion.getSynDingDeptId());
storeDetail.setFightName(fightRegion.getName()); storeDetail.setFightName(fightRegion.getName());