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:
shuo.wang
2025-05-13 10:33:51 +08:00
parent 3e8a2d272e
commit d9af75edca
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml
View File

@@ -43,6 +43,7 @@
c.line_id as lineId, c.line_id as lineId,
c.region_id as regionId, c.region_id as regionId,
c.store_type as storeType, c.store_type as storeType,
c.join_mode as joinMode,
b.shop_stage as stage, b.shop_stage as stage,
b.shop_sub_stage as subStage, b.shop_sub_stage as subStage,
b.shop_sub_stage_status as subStageStatus, b.shop_sub_stage_status as subStageStatus,

3
coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml
View File

@@ -38,6 +38,7 @@
c.id as shopId, c.id as shopId,
c.line_id as lineId, c.line_id as lineId,
c.region_id as regionId, c.region_id as regionId,
c.join_mode as joinMode,
c.store_type as storeType, c.store_type as storeType,
b.shop_stage as stage, b.shop_stage as stage,
b.shop_sub_stage as subStage, b.shop_sub_stage as subStage,
@@ -62,6 +63,7 @@
c.line_id as lineId, c.line_id as lineId,
c.region_id as regionId, c.region_id as regionId,
c.store_type as storeType, c.store_type as storeType,
c.join_mode as joinMode,
b.shop_stage as stage, b.shop_stage as stage,
b.shop_sub_stage as subStage, b.shop_sub_stage as subStage,
b.shop_sub_stage_status as subStageStatus, b.shop_sub_stage_status as subStageStatus,
@@ -85,6 +87,7 @@
c.line_id as lineId, c.line_id as lineId,
c.region_id as regionId, c.region_id as regionId,
c.store_type as storeType, c.store_type as storeType,
c.join_mode as joinMode,
b.shop_stage as stage, b.shop_stage as stage,
b.shop_sub_stage as subStage, b.shop_sub_stage as subStage,
b.shop_sub_stage_status as subStageStatus, b.shop_sub_stage_status as subStageStatus,

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

@@ -42,6 +42,8 @@ public class BaseInfoVO {
@ApiModelProperty("子阶段状态") @ApiModelProperty("子阶段状态")
private Integer workflowSubStageStatus; private Integer workflowSubStageStatus;
@ApiModelProperty("加盟模式")
private Integer joinMode;
public BaseInfoVO(){} public BaseInfoVO(){}
/** /**
@@ -59,6 +61,7 @@ public class BaseInfoVO {
this.userPortraitList = baseInfoVO.getUserPortraitList(); this.userPortraitList = baseInfoVO.getUserPortraitList();
this.workflowStage = baseInfoVO.getWorkflowStage(); this.workflowStage = baseInfoVO.getWorkflowStage();
this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus(); this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus();
this.joinMode = baseInfoVO.getJoinMode();
} }

2
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java
View File

@@ -45,6 +45,8 @@ public class PreparationCommonPendingVO {
private String submitTime; private String submitTime;
@ApiModelProperty("门店类型") @ApiModelProperty("门店类型")
private Integer storeType; private Integer storeType;
@ApiModelProperty("加盟模式")
private Integer joinMode;
private Long regionId; private Long regionId;
private Date updateTime; private Date updateTime;

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

@@ -132,6 +132,7 @@ public class DeskServiceImpl implements DeskService {
payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime())); payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime()));
} }
list.add(payStagePendingVO); list.add(payStagePendingVO);
}); });
page.setList(list); page.setList(list);
@@ -192,6 +193,7 @@ public class DeskServiceImpl implements DeskService {
}); });
} }
baseInfoVO.setUserPortraitList(labelBaseInfoList); baseInfoVO.setUserPortraitList(labelBaseInfoList);
baseInfoVO.setJoinMode(lineInfoDO.getJoinMode());
baseInfoVO.setWantShopAreaName(wantShopAreaMap.get(lineInfoDO.getWantShopAreaId())); baseInfoVO.setWantShopAreaName(wantShopAreaMap.get(lineInfoDO.getWantShopAreaId()));
return baseInfoVO; return baseInfoVO;
} }
@@ -442,7 +444,7 @@ public class DeskServiceImpl implements DeskService {
//只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师 //只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师
if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) { if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId()); return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId());
} }
//只有设计师 查询 指定当前用户和阶段为 901 设计中 //只有设计师 查询 指定当前用户和阶段为 901 设计中
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {
@@ -450,7 +452,7 @@ public class DeskServiceImpl implements DeskService {
return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId()); return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId());
} }
//有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
return decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId()); return decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId());
} }
@@ -484,7 +486,7 @@ public class DeskServiceImpl implements DeskService {
vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
} }
} else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) {
vo.setSubmitTime(DateUtils.parseDateToStr( SPECIAL_DATE_START,constructionMap.get(vo.getShopId()))); vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, constructionMap.get(vo.getShopId())));
} }
} }
@@ -672,13 +674,16 @@ public class DeskServiceImpl implements DeskService {
preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setShopId(x.getShopId());
ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO()); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO());
preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType());
if (shopInfoDO != null) { if (StringUtil.isNotEmpty(shopInfoDO.getDetailAddress())) {
preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress());
} else {
PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId()); PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId());
if (pointInfoDO != null) { if (pointInfoDO != null) {
preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress());
} }
preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
} }
preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode());
preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(), new PlanLineDTO()).getInvestmentManagerName()); preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(), new PlanLineDTO()).getInvestmentManagerName());
preparationCommonPendingVO.setStage(x.getShopStage()); preparationCommonPendingVO.setStage(x.getShopStage());
preparationCommonPendingVO.setSubStage(x.getShopSubStage()); preparationCommonPendingVO.setSubStage(x.getShopSubStage());
@@ -746,13 +751,10 @@ public class DeskServiceImpl implements DeskService {
operationLogDOList.forEach(x -> { operationLogDOList.forEach(x -> {
PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO(); PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO();
ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO()); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO());
if (shopInfoDO != null) { preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType());
PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId()); preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode());
if (pointInfoDO != null) { preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress());
preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
}
preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
}
preparationCommonPendingVO.setLineId(shopInfoDO.getLineId()); preparationCommonPendingVO.setLineId(shopInfoDO.getLineId());
preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setShopId(x.getShopId());
preparationCommonPendingVO.setSubStage(x.getShopSubStage()); preparationCommonPendingVO.setSubStage(x.getShopSubStage());