From f9e69f701435ed0a0d66d1e89c8400fd47d5d8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Apr 2024 17:13:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/OpenAreaVO.java | 2 +- .../java/com/cool/store/service/impl/OpenAreaServiceImpl.java | 2 ++ .../java/com/cool/store/controller/webb/OpenAreaController.java | 2 +- coolstore-partner-web/src/main/resources/application.properties | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java index a00da02f4..2474265d2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java @@ -41,7 +41,7 @@ public class OpenAreaVO { private Date createTime; @ApiModelProperty("更新时间") - private Date updateTime; + private String updateTime; @ApiModelProperty("更新人") private String updateUserId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index 13f70a1d5..dea6a4f70 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import com.alibaba.excel.util.DateUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; @@ -175,6 +176,7 @@ public class OpenAreaServiceImpl implements OpenAreaService { hyOpenAreaInfoDOList.stream().forEach(x->{ OpenAreaVO openAreaVO = convertDoToVo(x); openAreaVO.setUpdateUserName(userMap.get(x.getUpdateUserId())); + openAreaVO.setUpdateTime(DateUtils.format(x.getUpdateTime(),DateUtils.DATE_FORMAT_19)); list.add(openAreaVO); }); hyOpenAreaInfoDOPageInfo.setList(list); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java index f5ab3f0ab..71e331769 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java @@ -64,7 +64,7 @@ public class OpenAreaController { @PostMapping(path = "/changeOpenAreaStatus") @ApiOperation("变更开放区域状态") public ResponseResult changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ - String userId = ""; + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest)); } diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 2a707966a..39d308f91 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-web -spring.profiles.active=@profileActive@ +spring.profiles.active=test server.port=40000 server.servlet.context-path=/xfsg From c1f94d7d226ecc00ed364d1c86fb61164dd745ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Apr 2024 17:14:26 +0800 Subject: [PATCH 2/6] app --- coolstore-partner-web/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 39d308f91..2a707966a 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-web -spring.profiles.active=test +spring.profiles.active=@profileActive@ server.port=40000 server.servlet.context-path=/xfsg From 925bee68f8ad36d092449d09848520531a476c5a Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 9 Apr 2024 17:30:10 +0800 Subject: [PATCH 3/6] request.getAreaCode() --- .../cool/store/service/impl/JoinIntentionServiceImpl.java | 5 ++++- .../store/service/impl/TrainingExperienceServiceImpl.java | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 941b4efa7..7472bd419 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.HyOpenAreaInfoDAO; import com.cool.store.dao.LineInfoDAO; import com.cool.store.dao.RegionAreaConfigDao; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.xml.bind.util.JAXBSource; import java.util.Objects; import static com.cool.store.enums.ErrorCodeEnum.LINE_ID_IS_NOT_EXIST; @@ -55,6 +57,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt @Override @Transactional(rollbackFor = Exception.class) public boolean submit(JoinIntentionRequest request) { + log.info("submit request ：{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } @@ -66,7 +69,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt if (Objects.isNull(lineInfoParam)) { throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); } - if (Objects.nonNull(request.getWantShopArea())){ + if (Objects.nonNull(request.getAreaCode())){ EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, Long.valueOf(request.getWantShopArea())); lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); } 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 c66ae6a9b..016f17efd 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 @@ -62,20 +62,21 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr } LeaseBaseInfoDO leaseBaseInfoDO = request.toLeaseBaseInfoDO(); Date currentDate = new Date(); + LineInfoDO lineInfoDO = new LineInfoDO(); if (request.getExperienceStartTime().compareTo(request.getExperienceEndTime()) >= 0){ throw new ServiceException("结束时间不能早于开始时间"); } if (currentDate.before(request.getExperienceStartTime())){ leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); + lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); }else if (currentDate.after(request.getExperienceStartTime()) || currentDate.before(request.getExperienceEndTime())){ leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode()); + lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode()); }else { throw new ServiceException("时间"); } trainingExperienceMapper.insert(leaseBaseInfoDO); - LineInfoDO lineInfoDO = new LineInfoDO(); lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.STORE_EXPERIENCE.getCode()); - lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); lineInfoDO.setId(request.getLineId()); lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO); return true; From 2d0dd0a5f72ee1b0b7f0a8a6c01a5a1619975b55 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Tue, 9 Apr 2024 17:43:41 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=89=BE=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/CommonConstants.java | 2 ++ .../com/cool/store/dao/EnterpriseUserDAO.java | 7 ++++++ .../store/mapper/EnterpriseUserMapper.java | 3 +++ .../resources/mapper/EnterpriseUserMapper.xml | 10 ++++++++ .../impl/UserAuthMappingServiceImpl.java | 23 +++++++++++++++---- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 3087f9ee0..167e680f1 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -149,5 +149,7 @@ public class CommonConstants { public static final Long LONG_ONE = 1L; + public static final String DEAULT_INVESTMENT_JOBNUMBER = "020125244825417786"; + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index 9a3c19b86..67bf63b7e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -34,6 +34,13 @@ public class EnterpriseUserDAO { return enterpriseUserMapper.getUserInfoById( userId); } + public EnterpriseUserDO getUserInfoByJobnumber(String jobnumber){ + if(StringUtils.isAnyBlank(jobnumber)){ + return null; + } + return enterpriseUserMapper.getUserInfoByJobnumber(jobnumber); + } + public List getUserInfoByUserIds(List userIdList){ if(CollectionUtils.isEmpty(userIdList)){ return Lists.newArrayList(); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index da3d02c5f..2d24b1b5b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -19,6 +19,9 @@ public interface EnterpriseUserMapper { */ EnterpriseUserDO getUserInfoById(@Param("userId") String userId); + EnterpriseUserDO getUserInfoByJobnumber(@Param("jobnumber") String jobnumber); + + /** * 批量获取用户信息 * @param userIdList diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index fcf3d61d0..063b12e30 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -41,6 +41,16 @@ user_id = #{userId} + +