feat:装修阶段调整
This commit is contained in:
@@ -41,7 +41,7 @@ public interface PreparationService {
|
||||
|
||||
|
||||
/**
|
||||
* 证照办理完成 初始化平台建店数据
|
||||
* 证照办理+建店资料 都完成 初始化平台建店数据
|
||||
* @param shopId
|
||||
*/
|
||||
void licenseCompleted(Long shopId);
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.cool.store.request.BuildInformationRequest;
|
||||
import com.cool.store.response.BuildInformationResponse;
|
||||
import com.cool.store.service.BuildInformationService;
|
||||
import com.cool.store.mapper.BuildInformationMapper;
|
||||
import com.cool.store.service.PreparationService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -40,6 +41,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{
|
||||
private PointInfoDAO pointInfoDAO;
|
||||
@Autowired
|
||||
private ShopInfoDAO shopInfoDAO;
|
||||
@Resource
|
||||
PreparationService preparationService;
|
||||
|
||||
@Override
|
||||
public BuildInformationResponse getBuildInformation(Long shopId) {
|
||||
@@ -91,6 +94,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{
|
||||
buildInformationDO.setCreateTime(new Date());
|
||||
buildInformationDO.setUpdateTime(new Date());
|
||||
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153);
|
||||
//初始化数据
|
||||
preparationService.licenseCompleted(request.getShopId());
|
||||
return buildInformationDAO.insertSelective(buildInformationDO);
|
||||
}else {
|
||||
buildInformationDO.setUpdateTime(new Date());
|
||||
|
||||
@@ -609,13 +609,13 @@ public class DecorationServiceImpl implements DecorationService {
|
||||
constructionDataVO.setConstructionRemark(decoration.getConstructionRemark());
|
||||
constructionDataVO.setConstructionPlanStartTime(decoration.getConstructionPlanStartTime()!=null?decoration.getConstructionPlanStartTime().getTime():null);
|
||||
constructionDataVO.setConstructionPlanEndTime(decoration.getConstructionPlanEndTime()!=null?decoration.getConstructionPlanEndTime().getTime():null);
|
||||
constructionDataVO.setConstructionCreateTime(decoration.getConstructionCreateTime().getTime());
|
||||
constructionDataVO.setConstructionCreateTime(decoration.getConstructionCreateTime()!=null?decoration.getConstructionCreateTime().getTime():null);
|
||||
constructionDataVO.setConstructionCreateUser(decoration.getConstructionCreateUser());
|
||||
if (StringUtils.isNotEmpty(decoration.getConstructionCreateUser())){
|
||||
EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(decoration.getConstructionCreateUser());
|
||||
constructionDataVO.setConstructionCreateUserName(user.getName());
|
||||
}
|
||||
return null;
|
||||
return constructionDataVO;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -218,7 +218,7 @@ public class PreparationServiceImpl implements PreparationService {
|
||||
ShopStageInfoDO data17 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage());
|
||||
data17.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus());
|
||||
|
||||
list.addAll(Arrays.asList(data3,data4,data14,data15,data16,data17));
|
||||
list.addAll(Arrays.asList(data3,data4,data9,data14,data15,data16,data17));
|
||||
shopStageInfoDAO.batchUpdate(list);
|
||||
}
|
||||
}
|
||||
@@ -233,8 +233,10 @@ public class PreparationServiceImpl implements PreparationService {
|
||||
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
|
||||
Boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43.getShopSubStageStatus().
|
||||
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_4.getShopSubStage()).getShopSubStageStatus());
|
||||
Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus().
|
||||
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
|
||||
//都完成了 初始化后续流程数据
|
||||
if (flag1&&flag2) {
|
||||
if (flag1&&flag2&&flag3) {
|
||||
//初始化后续流程数据s
|
||||
List<ShopStageInfoDO> list = new ArrayList<>();
|
||||
ShopStageInfoDO data18 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_18.getShopSubStage());
|
||||
|
||||
Reference in New Issue
Block a user