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

Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

Browse Source
This commit is contained in:
shuo.wang
2024-10-11 16:13:54 +08:00
parent 6e8b2b2f35 f5722c37e7
commit 5389367022
12 changed files with 274 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
View File

@@ -15,25 +15,30 @@ public enum ShopSubStageEnum {
SHOP_STAGE_1(ShopStageEnum.SHOP_STAGE_1, 10, "选址", 12),
SHOP_STAGE_2(ShopStageEnum.SHOP_STAGE_1, 20, "上传租赁合同", 14),
SHOP_STAGE_3(ShopStageEnum.SHOP_STAGE_2, 30, "营业执照办理", 24),
SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "食安许可证", 28),
SHOP_STAGE_3(ShopStageEnum.SHOP_STAGE_2, 30, "营业执照办理", 23),
SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "食安许可证", 55),
SHOP_STAGE_5(ShopStageEnum.SHOP_STAGE_2, 50, "员工招聘", 23),
SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 1),
SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 4),
SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 21),
SHOP_STAGE_11(ShopStageEnum.SHOP_STAGE_2, 110, "施工阶段", 31),
SHOP_STAGE_12(ShopStageEnum.SHOP_STAGE_2, 120, "装修验收", 32),
SHOP_STAGE_14(ShopStageEnum.SHOP_STAGE_2, 140, "开业运营方案", 23),
SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 14),
SHOP_STAGE_11(ShopStageEnum.SHOP_STAGE_2, 110, "施工阶段", 25),
SHOP_STAGE_12(ShopStageEnum.SHOP_STAGE_2, 120, "装修验收", 27),
SHOP_STAGE_14(ShopStageEnum.SHOP_STAGE_2, 140, "开业运营方案", 28),
SHOP_STAGE_15(ShopStageEnum.SHOP_STAGE_2, 150, "建店资料收集", 1),
SHOP_STAGE_16(ShopStageEnum.SHOP_STAGE_2, 160, "POS", 1),
SHOP_STAGE_17(ShopStageEnum.SHOP_STAGE_2, 170, "订货系统", 1),
SHOP_STAGE_15(ShopStageEnum.SHOP_STAGE_2, 150, "建店资料收集", 9),
SHOP_STAGE_16(ShopStageEnum.SHOP_STAGE_2, 160, "POS开通", 10),
SHOP_STAGE_17(ShopStageEnum.SHOP_STAGE_2, 170, "订货系统开通", 10),
SHOP_STAGE_18(ShopStageEnum.SHOP_STAGE_3, 180, "抖音", null),
SHOP_STAGE_19(ShopStageEnum.SHOP_STAGE_3, 190, "美团外卖", null),
SHOP_STAGE_20(ShopStageEnum.SHOP_STAGE_3, 200, "美团团购", null),
SHOP_STAGE_21(ShopStageEnum.SHOP_STAGE_3, 210, "饿了么", null),
SHOP_STAGE_22(ShopStageEnum.SHOP_STAGE_3, 220, "快手", null),
SHOP_STAGE_23(ShopStageEnum.SHOP_STAGE_2, 230, "信发系统开通", 10),
SHOP_STAGE_24(ShopStageEnum.SHOP_STAGE_2, 240, "营帐通开通", 10),
SHOP_STAGE_18(ShopStageEnum.SHOP_STAGE_3, 180, "抖音", 1),
SHOP_STAGE_19(ShopStageEnum.SHOP_STAGE_3, 190, "美团外卖", 1),
SHOP_STAGE_20(ShopStageEnum.SHOP_STAGE_3, 200, "美团团购", 1),
SHOP_STAGE_21(ShopStageEnum.SHOP_STAGE_3, 210, "饿了么", 1),
SHOP_STAGE_22(ShopStageEnum.SHOP_STAGE_3, 220, "快手", 1),
;
//阶段
@@ -110,6 +115,8 @@ public enum ShopSubStageEnum {
case SHOP_STAGE_20:
case SHOP_STAGE_21:
case SHOP_STAGE_22:
case SHOP_STAGE_23:
case SHOP_STAGE_24:
return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
default:
return null;
@@ -121,22 +128,16 @@ public enum ShopSubStageEnum {
}
public String getPlanCompleteTime(LocalDate planCompleteTime, LocalDate planSelectPointCompleteDate) {
public String getPlanCompleteTime(LocalDate planCompleteTime) {
switch (this) {
case SHOP_STAGE_1:
case SHOP_STAGE_2:
case SHOP_STAGE_5:
case SHOP_STAGE_7:
case SHOP_STAGE_8:
return planCompleteTime.plusDays(getPlanCompleteDays()).toString();
case SHOP_STAGE_4:
case SHOP_STAGE_9:
case SHOP_STAGE_11:
case SHOP_STAGE_12:
case SHOP_STAGE_14:
return planSelectPointCompleteDate.plusDays(getPlanCompleteDays()).toString();
default:
case SHOP_STAGE_18:
case SHOP_STAGE_19:
case SHOP_STAGE_20:
case SHOP_STAGE_21:
case SHOP_STAGE_22:
return null;
default:
return planCompleteTime.plusDays(getPlanCompleteDays()).toString();
}
}

11
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
View File

@@ -26,7 +26,7 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE),
//营业执照办理
SHOP_SUB_STAGE_STATUS_30(ShopSubStageEnum.SHOP_STAGE_3, 300, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_30(ShopSubStageEnum.SHOP_STAGE_3, 300, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_33(ShopSubStageEnum.SHOP_STAGE_3, 330, "已完成", Boolean.TRUE),
//食安许可证
SHOP_SUB_STAGE_STATUS_40(ShopSubStageEnum.SHOP_STAGE_4, 400, "待提交", Boolean.FALSE),
@@ -114,6 +114,15 @@ public enum ShopSubStageStatusEnum {
SHOP_SUB_STAGE_STATUS_222(ShopSubStageEnum.SHOP_STAGE_22, 2220,"开通失败", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_223(ShopSubStageEnum.SHOP_STAGE_22, 2230, "开通成功", Boolean.TRUE),
//信发系统开通
SHOP_SUB_STAGE_STATUS_230(ShopSubStageEnum.SHOP_STAGE_23, 2300, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_235(ShopSubStageEnum.SHOP_STAGE_23, 2350, "已完成", Boolean.TRUE),
//营帐通开通
SHOP_SUB_STAGE_STATUS_240(ShopSubStageEnum.SHOP_STAGE_24, 2400, "待提交", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_245(ShopSubStageEnum.SHOP_STAGE_24, 2450, "已完成", Boolean.TRUE),
;
private ShopSubStageEnum shopSubStageEnum;

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
View File

@@ -160,6 +160,12 @@ public class ShopInfoDAO {
return shopInfoMapper.selectByStoreNum(storeNum);
}
public List<ShopInfoDO> selectByIdOrSelectAll(Long shopId){
return shopInfoMapper.selectByIdOrSelectAll(shopId);
}
public List<PlatformBuildListResponse> platformBuildList(List<Long> regionIds, platformBuildListRequest request){
if(CollectionUtils.isEmpty(regionIds)){
return new ArrayList<>();

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

@@ -49,7 +49,6 @@ public class ShopStageInfoDAO {
}
List<ShopStageInfoDO> addShopStageList = new ArrayList<>();
LocalDate selectStartDate = LocalDate.now();
LocalDate planSelectPointCompleteDate = selectStartDate.plusDays(ShopSubStageEnum.getSelectStageMaxDays());
for (Long shopId : shopIds) {
for (ShopSubStageEnum shopSubStageEnum : ShopSubStageEnum.values()) {
ShopStageInfoDO shopStageInfo = new ShopStageInfoDO();
@@ -62,7 +61,7 @@ public class ShopStageInfoDAO {
shopStageInfo.setShopSubStageStatus(initStatus.getShopSubStageStatus());
shopStageInfo.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageEnum.getInitStatus().getShopSubStageStatusName());
shopStageInfo.setIsTerminated(Boolean.FALSE);
shopStageInfo.setPlanCompleteTime(shopSubStageEnum.getPlanCompleteTime(selectStartDate, planSelectPointCompleteDate));
shopStageInfo.setPlanCompleteTime(shopSubStageEnum.getPlanCompleteTime(selectStartDate));
addShopStageList.add(shopStageInfo);
}
}
@@ -70,6 +69,13 @@ public class ShopStageInfoDAO {
return shopStageInfoMapper.batchInsert(addShopStageList);
}
public Integer batchInsert( List<ShopStageInfoDO> addShopStageList){
if(CollectionUtils.isEmpty(addShopStageList)){
return 0;
}
return shopStageInfoMapper.batchInsert(addShopStageList);
}
public Integer batchUpdate(List<ShopStageInfoDO> shopStageList) {
if(CollectionUtils.isEmpty(shopStageList)){
return 0;

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
View File

@@ -90,5 +90,8 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
*/
List<ShopInfoDO> selectShopListByRegionId(@Param("regionIds") List<Long> regionIds,@Param("shopSubStage") Integer shopSubStage,@Param("subStageStatus")List<Integer> subStageStatus,@Param("keyWord")String keyWord);
List<ShopInfoDO> selectByIdOrSelectAll(@Param("shopId") Long shopId);
List<PlatformBuildListResponse> platformBuildList(@Param("list") List<Long> regionIds,@Param("request") platformBuildListRequest request);
}

12
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -206,5 +206,17 @@
order by xsi.create_time
</select>
<select id="selectByIdOrSelectAll" resultMap="BaseResultMap">
select
<include refid="allColumn"/>
from
xfsg_shop_info
<where>
<if test="shopId!=null">
and id = #{shopId}
</if>
</where>
</select>
</mapper>

19
coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.service;
/**
* @Author suzhuhong
* @Date 2024/10/10 16:20
* @Version 1.0
*/
public interface DataHandleService {
/**
* V1.1 -> V1.2 数据处理
* @return
*/
Boolean dataHandleService(Long shopId);
}

166
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java Normal file
View File

@@ -0,0 +1,166 @@
package com.cool.store.service.impl;
import cn.hutool.core.date.DateUtil;
import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.ShopInfoDAO;
import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.entity.ShopInfoDO;
import com.cool.store.entity.ShopStageInfoDO;
import com.cool.store.enums.point.ShopStageEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.service.DataHandleService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.unit.DataUnit;
import javax.annotation.Resource;
import java.lang.reflect.Array;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Author suzhuhong
* @Date 2024/10/10 16:24
* @Version 1.0
*/
@Service
public class DataHandleServiceImpl implements DataHandleService {
@Resource
ShopInfoDAO shopInfoDAO;
@Resource
ShopStageInfoDAO shopStageInfoDAO;
@Override
public Boolean dataHandleService(Long shopId) {
//查询所有的门店线索数据（如果指定shopId 查指定门店的数据）
List<ShopInfoDO> shopInfoDOS = shopInfoDAO.selectByIdOrSelectAll(shopId);
for (ShopInfoDO x : shopInfoDOS) {
List<ShopStageInfoDO> shopStageInfo = shopStageInfoDAO.getShopStageInfo(x.getId(), null);
if (CollectionUtils.isEmpty(shopStageInfo)) {
continue;
}
Map<Integer, ShopStageInfoDO> infoDOMap = ListUtils.emptyIfNull(shopStageInfo).stream().collect(Collectors.toMap(k -> k.getShopSubStage(), v -> v, (k1, k2) -> k1));
//先初始化新增的阶段
initShopStageInfo(x.getLineId(),x.getId());
//老阶段改造-证照
ShopStageInfoDO shopStageInfoDO = infoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4);
this.licenseHandle(shopStageInfoDO);
}
return null;
}
public void licenseHandle(ShopStageInfoDO shopStageInfoDO){
if (Objects.isNull(shopStageInfoDO)){
return;
}
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){
//未完成 拆分数据 老的证照办理变为食品许可证
ShopSubStageEnum shopSubStageEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageEnum();
shopStageInfoDO.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatusName());
shopStageInfoDAO.updateByShopId(shopStageInfoDO);
//新增营业执照证照办理
shopStageInfoDO.setId(null);
ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
shopStageInfoDO.setShopSubStage(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage());
shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
shopStageInfoDO.setRemark(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
}
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){
//未完成 拆分数据 老的证照办理变为食品许可证
ShopSubStageEnum shopSubStageEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageEnum();
shopStageInfoDO.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatusName());
shopStageInfoDAO.updateByShopId(shopStageInfoDO);
//新增营业执照证照办理
shopStageInfoDO.setId(null);
ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30;
shopStageInfoDO.setShopSubStage(shopSubStageStatus30.getShopSubStageEnum().getShopSubStage());
shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
shopStageInfoDO.setRemark(shopSubStageStatus30.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
}
//待审核
Integer a = 410;
if (a.equals(shopStageInfoDO.getShopSubStageStatus())){
//未完成 拆分数据 老的证照办理变为食品许可证
ShopSubStageStatusEnum shopSubStageStatus43 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43;
shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus43.getShopSubStageStatus());
shopStageInfoDO.setRemark(shopSubStageStatus43.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus43.getShopSubStageStatusName());
shopStageInfoDO.setIsTerminated(Boolean.TRUE);
shopStageInfoDO.setActualCompleteTime(DateUtil.formatDate(new Date()));
shopStageInfoDAO.updateByShopId(shopStageInfoDO);
//新增营业执照证照办理
shopStageInfoDO.setId(null);
ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33;
shopStageInfoDO.setShopSubStage(shopSubStageStatus30.getShopSubStageEnum().getShopSubStage());
shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
shopStageInfoDO.setRemark(shopSubStageStatus30.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
shopStageInfoDO.setIsTerminated(Boolean.TRUE);
shopStageInfoDO.setActualCompleteTime(DateUtil.formatDate(new Date()));
shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
}
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){
//未完成 拆分数据 老的证照办理变为食品许可证
ShopSubStageEnum shopSubStageEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageEnum();
shopStageInfoDO.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatusName());
shopStageInfoDAO.updateByShopId(shopStageInfoDO);
//新增营业执照证照办理
shopStageInfoDO.setId(null);
ShopSubStageStatusEnum shopSubStageStatus30 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33;
shopStageInfoDO.setShopSubStage(shopSubStageStatus30.getShopSubStageEnum().getShopSubStage());
shopStageInfoDO.setShopSubStageStatus(shopSubStageStatus30.getShopSubStageStatus());
shopStageInfoDO.setRemark(shopSubStageStatus30.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageStatus30.getShopSubStageStatusName());
shopStageInfoDAO.batchInsert(Arrays.asList(shopStageInfoDO));
}
}
public Integer initShopStageInfo(Long lineId, Long shopId) {
List<ShopStageInfoDO> addShopStageList = new ArrayList<>();
LocalDate selectStartDate = LocalDate.now();
List<ShopSubStageEnum> list = Arrays.asList(
ShopSubStageEnum.SHOP_STAGE_15,
ShopSubStageEnum.SHOP_STAGE_16,
ShopSubStageEnum.SHOP_STAGE_17,
ShopSubStageEnum.SHOP_STAGE_18,
ShopSubStageEnum.SHOP_STAGE_19,
ShopSubStageEnum.SHOP_STAGE_20,
ShopSubStageEnum.SHOP_STAGE_21,
ShopSubStageEnum.SHOP_STAGE_22,
ShopSubStageEnum.SHOP_STAGE_23,
ShopSubStageEnum.SHOP_STAGE_24
);
for (ShopSubStageEnum shopSubStageEnum :list) {
ShopStageInfoDO shopStageInfo = new ShopStageInfoDO();
shopStageInfo.setLineId(lineId);
shopStageInfo.setShopId(shopId);
ShopStageEnum shopStageEnum = shopSubStageEnum.getShopStageEnum();
shopStageInfo.setShopStage(shopStageEnum.getShopStage());
shopStageInfo.setShopSubStage(shopSubStageEnum.getShopSubStage());
ShopSubStageStatusEnum initStatus = shopSubStageEnum.getInitStatus();
shopStageInfo.setShopSubStageStatus(initStatus.getShopSubStageStatus());
shopStageInfo.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR +shopSubStageEnum.getInitStatus().getShopSubStageStatusName());
shopStageInfo.setIsTerminated(Boolean.FALSE);
shopStageInfo.setPlanCompleteTime(shopSubStageEnum.getPlanCompleteTime(selectStartDate));
addShopStageList.add(shopStageInfo);
}
return shopStageInfoDAO.batchInsert(addShopStageList);
}
}

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

@@ -369,7 +369,6 @@ public class DeskServiceImpl implements DeskService {
* @return
*/
private PageInfo<PreparationCommonPendingVO> commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user,ShopSubStageEnum shopSubStageEnum,List<Integer> subStageStatusList,Boolean filterFlag){
PageHelper.startPage(pageNum, pageSize);
//user.getJobNumber()
List<String> authRegionIds = new ArrayList<>();
if (filterFlag){
@@ -377,6 +376,7 @@ public class DeskServiceImpl implements DeskService {
authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
}
}
PageHelper.startPage(pageNum, pageSize);
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
subStageStatusList, user==null?null:user.getUserId(),authRegionIds);
PageInfo result = new PageInfo<>(specialShopStageInfo);

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

@@ -379,20 +379,10 @@ public class LineServiceImpl implements LineService {
LinePayDO linePay = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId,PayBusinessTypeEnum.INTENT_MONEY.getCode(),null);
SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(qualificationsInfoDO.getPartnerId(), lineId);
// LeaseBaseInfoDO trainingExperience = trainingExperienceService.getTrainingExperience(lineId);
HashMap<Integer, Date> map = new HashMap<>();
interviewDOMap.forEach((k, v) ->{
// if (k.equals(InterviewTypeEnum.MEET.getCode())){
// map.put(WorkflowSubStageEnum.INVITING_INTERVIEWS.getCode(),dateMap.get(v));
// }
// if (k.equals(InterviewTypeEnum.INTERVIEW.getCode())){
// map.put(WorkflowSubStageEnum.FIRST_INTERVIEWS.getCode(),dateMap.get(v));
// }
// if (k.equals(InterviewTypeEnum.SECOND_INTERVIEW.getCode())){
// map.put(WorkflowSubStageEnum.SECOND_INTERVIEWS.getCode(),dateMap.get(v));
// }
if (k.equals(10)){
map.put(WorkflowSubStageEnum.INTEND.getCode(),dateMap.get(v));
}
@@ -403,9 +393,6 @@ public class LineServiceImpl implements LineService {
if (signingBaseInfoDO != null){
map.put(WorkflowSubStageEnum.SIGN_INTENT_AGREEMENT.getCode(),signingBaseInfoDO.getCreateTime());
}
// if (trainingExperience != null){
// map.put(WorkflowSubStageEnum.STORE_EXPERIENCE.getCode(),trainingExperience.getExperienceEndTime());
// }
List<IntendProcessVO> list = new ArrayList<>();
for (WorkflowSubStageEnum workflowSubStageEnum : WorkflowSubStageEnum.values()) {

60
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
View File

@@ -196,30 +196,17 @@ public class PreparationServiceImpl implements PreparationService {
//都完成了 初始化后续流程数据
if (contractCompletionFlag) {
//初始化后续流程数据s
List<ShopStageInfoDO> list = new ArrayList<>();
ShopStageInfoDO data3 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage());
data3.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus());
ShopStageInfoDO data4 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage());
data4.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus());
ShopStageInfoDO data9 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
data9.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus());
ShopStageInfoDO data14 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage());
data14.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus());
ShopStageInfoDO data15 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage());
data15.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus());
ShopStageInfoDO data16 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage());
data16.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus());
ShopStageInfoDO data17 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage());
data17.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus());
list.addAll(Arrays.asList(data3,data4,data9,data14,data15,data16,data17));
shopStageInfoDAO.batchUpdate(list);
List<ShopSubStageStatusEnum> list = new ArrayList<>();
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240);
shopStageInfoDAO.batchUpdateShopStageStatus(shopId,list);
}
}
}
@@ -238,24 +225,13 @@ public class PreparationServiceImpl implements PreparationService {
//都完成了 初始化后续流程数据
if (flag1&&flag2&&flag3) {
//初始化后续流程数据s
List<ShopStageInfoDO> list = new ArrayList<>();
ShopStageInfoDO data18 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_18.getShopSubStage());
data18.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_180.getShopSubStageStatus());
ShopStageInfoDO data19 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_19.getShopSubStage());
data19.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_190.getShopSubStageStatus());
ShopStageInfoDO data20 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_20.getShopSubStage());
data20.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_200.getShopSubStageStatus());
ShopStageInfoDO data21 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_21.getShopSubStage());
data21.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_210.getShopSubStageStatus());
ShopStageInfoDO data22 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_22.getShopSubStage());
data22.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_220.getShopSubStageStatus());
list.addAll(Arrays.asList(data18,data19,data20,data21,data22));
shopStageInfoDAO.batchUpdate(list);
List<ShopSubStageStatusEnum> list = new ArrayList<>();
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_180);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_190);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_200);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_210);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_220);
shopStageInfoDAO.batchUpdateShopStageStatus(shopId,list);
}
}
}

4
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -32,8 +32,8 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-in
rocketmq.topic=simple_message
#oss配置
oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
oss.accessKeyId=LTAI5t6Zk3Y3vyrMXC87jGYB
oss.accessKeySecret=6Gw06jtW5xNKWqbhnt1KmVZx1z9Dev
oss.endpoint=oss-cn-hangzhou.aliyuncs.com
oss.bucket=cool-store-hsay
oss.file.dir=partner/171cddee76471740/