From 81132c0c1c4fb22542cdedb38a3a3237b9eb24d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 7 Apr 2024 16:04:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/LineInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 9f4ff2ca7..8c2f49f44 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -320,11 +320,11 @@ + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index f937c31ff..07bdb7e27 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -358,5 +358,21 @@ #{roleName} + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java index b40d758c3..2f6fe996c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java @@ -31,5 +31,7 @@ public class LeaseBaseInfoDO { private Integer deleted; + private String storeManager; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 8fa6c2449..c6c7d2b2d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -1,16 +1,14 @@ package com.cool.store.service.impl; import com.cool.store.dao.LineInfoDAO; -import com.cool.store.entity.LeaseBaseInfoDO; -import com.cool.store.entity.LineInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.ExperienceStatusEnum; import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.LineInfoMapper; -import com.cool.store.mapper.TrainingExperienceMapper; +import com.cool.store.mapper.*; import com.cool.store.request.TrainingExperienceDistributionRequest; import com.cool.store.service.TrainingExperienceService; import lombok.extern.slf4j.Slf4j; @@ -19,7 +17,9 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.annotation.Tainted; -import java.util.Objects; +import java.time.LocalDate; +import java.util.*; +import java.util.stream.Collectors; import static com.cool.store.enums.ErrorCodeEnum.INTERVIEW_LINE_ID_IS_NULL; @@ -35,6 +35,22 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Resource LineInfoDAO lineInfoDAO; + + @Resource + SysRoleMapper sysRoleMapper; + + @Resource + EnterpriseUserMapper enterpriseUserMapper; + + @Resource + RegionMapper regionMapper; + + @Resource + UserAuthMappingMapper userAuthMappingMapper; + + @Resource + EnterpriseUserRoleMapper enterpriseUserRoleMapper; + @Override @Transactional(rollbackFor = Exception.class) public boolean distribution(TrainingExperienceDistributionRequest request) { @@ -45,6 +61,17 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr throw new ServiceException(INTERVIEW_LINE_ID_IS_NULL); } LeaseBaseInfoDO leaseBaseInfoDO = request.toLeaseBaseInfoDO(); + Date currentDate = new Date(); + if (request.getExperienceStartTime().compareTo(request.getExperienceEndTime()) >= 0){ + throw new ServiceException("结束时间不能早于开始时间"); + } + if (currentDate.before(request.getExperienceStartTime())){ + leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); + }else if (currentDate.after(request.getExperienceStartTime()) || currentDate.before(request.getExperienceEndTime())){ + leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode()); + }else { + throw new ServiceException("时间"); + } trainingExperienceMapper.insert(leaseBaseInfoDO); LineInfoDO lineInfoDO = new LineInfoDO(); lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.STORE_EXPERIENCE.getCode()); @@ -71,7 +98,20 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Override public LeaseBaseInfoDO getTrainingExperience(Long lineId) { + String eid = "e17cd2dc350541df8a8b0af9bd27f77d"; + List roleNames = new ArrayList<>(); + roleNames.add("加盟店店长"); + roleNames.add("加盟店储备店长"); + LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); + String storeId = leaseBaseInfoDO.getStoreId(); + RegionDO regionDO = regionMapper.getRegionByStoreId(storeId); + List xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames); + List roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList()); + List userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds); + List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByRoleIdList); + String storeManagers = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); + leaseBaseInfoDO.setStoreManager(storeManagers); return leaseBaseInfoDO; } From 4f7a43aab3956fb69f78d081550fe90683ef43c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 7 Apr 2024 17:07:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/LineInfoMapper.xml | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 94321353e..910214dae 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -335,37 +335,38 @@