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

Merge branch 'cc_20240702_v1.0.1' into 'master'

Browse Source 
Cc 20240702 v1.0.1

See merge request hangzhou/java/custom_zxjp!8
This commit is contained in:
苏竹红
2024-07-04 07:50:55 +00:00
parent 3636a2189f 17f75658b7
commit 9d27c807be
16 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

@@ -247,8 +247,8 @@ public class ShopStageInfoDAO {
}
public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList,String investmentUserId,String supervisorId,Integer queryUserType){
return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId,supervisorId,queryUserType);
List<Integer> shopSubStageStatusList,String investmentUserId){
return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId);
}
/**
* @Auther: wangshuo

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
View File

@@ -130,9 +130,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
List<ShopStageInfoDO> getSpecialShopStageInfo(@Param("shopIds") List<Long> shopIds,
@Param("shopSubStage") Integer shopSubStage,
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("investmentUserId") String investmentUserId,
@Param("supervisorId") String supervisorId,
@Param("queryUserType") Integer queryUserType);
@Param("investmentUserId") String investmentUserId);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
/**

10
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -234,12 +234,9 @@
select
*
from xfsg_shop_stage_info a
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 0 ">
<if test="investmentUserId!=null and investmentUserId!=''">
left join xfsg_line_info b on a.line_id = b.id
</if>
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 1 ">
left join xfsg_system_building_shop c on a.shop_id = c.shop_id
</if>
<where>
<if test="shopIds != null and shopIds.size() > 0">
and a.shop_id in
@@ -256,12 +253,9 @@
#{stageStatus}
</foreach>
</if>
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 0">
<if test="investmentUserId!=null and investmentUserId!=''">
and b.investment_manager = #{investmentUserId}
</if>
<if test="supervisorId!=null and supervisorId!='' and queryUserType == 1">
and c.supervisor_id = #{supervisorId}
</if>
</where>
</select>

3
coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java
View File

@@ -26,7 +26,4 @@ public class AuditPassRequest {
@ApiModelProperty("通过原因")
private String passReason;
@ApiModelProperty("战区regionId,只在意向加盟申请阶段使用")
private Long fightRegion;
}

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

@@ -57,7 +57,7 @@ public class DecorationDesignRequest {
threeAcceptanceDTO.setAcceptanceTime(new Date());
threeAcceptanceDTO.setStatus(CommonConstants.ONE);
threeAcceptanceDTO.setResult(CommonConstants.ONE);
threeAcceptanceDTO.setRemark("加盟商确认设计方案通过");
threeAcceptanceDTO.setRemark(threeAcceptanceDTO.getRemark() == null ? "" : threeAcceptanceDTO.getRemark());
decorationDesignInfoDO.setPartnerAcceptanceSignatures(JSONObject.toJSONString(threeAcceptanceDTO));
}
decorationDesignInfoDO.setUpdateTime(new Date());

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java
View File

@@ -100,6 +100,8 @@ public class PartnerBaseInfoVO {
@ApiModelProperty("大区regionId")
private Long bigRegionId;
private String unifiedSocialCreditCode;
@@ -118,6 +120,7 @@ public class PartnerBaseInfoVO {
partnerBaseInfoVO.setSettlementCardPic(qualificationsInfoDO.getSettlementCardPic());
partnerBaseInfoVO.setSettlementOpeningBank(qualificationsInfoDO.getSettlementOpeningBank());
partnerBaseInfoVO.setEntrepreneurialExperience(qualificationsInfoDO.getEntrepreneurialExperience());
partnerBaseInfoVO.setUnifiedSocialCreditCode(qualificationsInfoDO.getUnifiedSocialCreditCode());
partnerBaseInfoVO.setPreviouslyEngagedIndustries(qualificationsInfoDO.getPreviouslyEngagedIndustries());
partnerBaseInfoVO.setBankStatementsPic(qualificationsInfoDO.getBankStatementsPic());
partnerBaseInfoVO.setOldBrands(qualificationsInfoDO.getOldBrands());

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -273,10 +273,8 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
RegionDO regionDO = regionMapper.getBigRegionByRegionId(vo.getFightRegionId());
Long bigRegionIdByAreaId = regionDO.getId();
Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, vo.getFightRegionId()));
vo.setFightRegionId(vo.getFightRegionId());
vo.setFightRegion(regionNameMap.get(vo.getFightRegionId()));
vo.setBigRegionId(bigRegionIdByAreaId);
vo.setBigRegion(regionNameMap.get(bigRegionIdByAreaId));
vo.setBigRegionId(vo.getFightRegionId());
vo.setBigRegion(regionNameMap.get(vo.getFightRegionId()));
}
}
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -337,7 +337,7 @@ public class DeskServiceImpl implements DeskService {
@Override
public PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_8,
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_8,
Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus()), Constants.ZERO_INTEGER);
}
@@ -365,7 +365,7 @@ public class DeskServiceImpl implements DeskService {
PageHelper.startPage(pageNum, pageSize);
//user.getJobNumber()
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
subStageStatusList, user.getUserId(),user.getJobNumber(),type);
subStageStatusList, user==null?null:user.getUserId());
PageInfo result = new PageInfo<>(specialShopStageInfo);
List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList());

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -142,9 +142,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
updateLine.setId(lineInfo.getId());
updateLine.setWorkflowStage(WorkflowStageEnum.STORE.getCode());
updateLine.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode());
EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SELECT_SITE_COMMISSIONER, lineInfo.getWantShopAreaId());
String developmentManager = Optional.ofNullable(enterpriseUser).map(EnterpriseUserDO::getUserId).orElse(null);
updateLine.setDevelopmentManager(developmentManager);
updateLine.setDevelopmentManager(lineInfo.getInvestmentManager());
updateLine.setUpdateUserId(userId);
lineInfoDAO.updateLineInfo(updateLine);
//初始化店铺

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
View File

@@ -77,13 +77,13 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
lineInfoParam.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
lineInfoParam.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_5.getCode());
if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))) {
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode()));
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode()));
lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
}
lineInfoParam.setLineStatus(1);
if (lineInfoParam.getWantShopAreaId() != null) {
Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
lineInfoParam.setBigRegionId(regionId);
lineInfoParam.setRegionId(regionId);
}
lineInfoDAO.insertOrUpdate(lineInfoParam);
QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();

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

@@ -48,9 +48,6 @@ public abstract class LineFlowService {
if(!lineInfo.getWorkflowSubStage().equals(request.getWorkflowSubStage())){
throw new ServiceException(ErrorCodeEnum.WORK_FLOW_STAGE_PASS_ERROR);
}
if (WorkflowSubStageEnum.INTEND.getCode().equals(lineInfo.getWorkflowSubStage())){
lineInfo.setRegionId(request.getFightRegion());
}
String partnerId = lineInfo.getPartnerId();
LineAuditInfoDO auditInfo = new LineAuditInfoDO();
auditInfo.setLineId(request.getLineId());

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -102,14 +102,11 @@ public class LineServiceImpl implements LineService {
result.setInvestmentManagerName(user.getName());
result.setInvestmentManagerMobile(user.getMobile());
}
result.setBigRegionId(lineInfo.getBigRegionId());
if(lineInfo.getRegionId() != null && lineInfo.getRegionId() != 0){
Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId());
Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId()));
result.setRegionId(lineInfo.getRegionId());
result.setRegionName(regionNameMap.get(lineInfo.getRegionId()));
result.setLargeRegionId(bigRegionIdByAreaId);
result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
}
LineAuditInfoDO lineAuditInfoDO = lineAuditInfoDAO.getAuditInfoByLineId(lineInfo.getId());
if (lineAuditInfoDO!=null){
@@ -416,7 +413,8 @@ public class LineServiceImpl implements LineService {
if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
userId = addLineRequest.getInvestmentManagerUserId();
}else {
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, addLineRequest.getWantShopAreaId());
//督导角色是招商专员
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId());
userId = user.getUserId();
}
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -988,12 +988,12 @@ public class PointServiceImpl implements PointService {
requestMap.put("partnerMobile",lineInfo.getMobile());
requestMap.put("lineId",String.valueOf(lineInfo.getId()));
requestMap.put("shopId",String.valueOf(shopId));
if (Objects.nonNull(shopInfo.getShopName())) {
requestMap.put("storeName",shopInfo.getShopName());
commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
}else {
commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
}
// if (Objects.nonNull(shopInfo.getShopName())) {
// requestMap.put("storeName",shopInfo.getShopName());
// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
// }else {
// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
// }
}
return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);
}

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

@@ -94,10 +94,9 @@ public class RegionServiceImpl implements RegionService {
@Override
public String getBelongWarRegionName(Long regionId) {
RegionPathNameVO regionPathNameVO = this.getAllRegionName(regionId);
if(regionPathNameVO != null && StringUtils.isNotBlank(regionPathNameVO.getAllRegionName())){
String allRegionName = regionPathNameVO.getAllRegionName();
return allRegionName.substring(allRegionName.indexOf(Constants.M_LINE) + 1);
RegionDO regionDO = regionMapper.getByRegionId(regionId);
if(regionDO != null){
return regionDO.getName();
}
return "";
}
@@ -107,11 +106,8 @@ public class RegionServiceImpl implements RegionService {
if(CollectionUtils.isEmpty(regionIds)){
return Maps.newHashMap();
}
Map<Long, String> regionNameMap = Maps.newHashMap();
for (Long regionId : regionIds) {
regionNameMap.put(regionId, getBelongWarRegionName(regionId));
}
return regionNameMap;
List<RegionDO> regionList = regionMapper.getByIds(regionIds);
return regionList.stream().collect(Collectors.toMap(RegionDO::getId, RegionDO::getName));
}
/**

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

@@ -70,8 +70,7 @@ public class ShopServiceImpl implements ShopService {
shopInfo.setPartnerId(lineInfo.getPartnerId());
//初始化
shopInfo.setStoreNum(RandomEightCharCodeUtils.getCode());
EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfo.getRegionId());
shopInfo.setSupervisorUserId((Objects.isNull(supervisor)||supervisor.getUserId()==null)?lineInfo.getInvestmentManager():supervisor.getUserId());
shopInfo.setSupervisorUserId(lineInfo.getInvestmentManager());
shopInfo.setShopName("店铺" + NumberConverter.convertArabicToChinese(i + 1));
addShopList.add(shopInfo);
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
View File

@@ -225,8 +225,8 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
String defaultJobnumber = getDefaultJobnumber(userRoleEnum);
// 如果找不到招商专员，则分配给默认的招商经理
if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
// 如果找不到督导，则分配给默认的督导
if (UserRoleEnum.SUPERVISION.equals(userRoleEnum)) {
EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(defaultJobnumber);
if (defaultUser == null) {
defaultUser = enterpriseUserDAO.getUserInfoById(defaultJobnumber);