diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index f25179aa3..0468fa252 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -88,4 +88,8 @@ public class LineInfoDAO { List lineInfo = lineInfoMapper.lineList(lineListRequest,userId,wantShopAreaIds); return lineInfo; } + + public void insertOrUpdate(LineInfoDO lineInfoParam){ + lineInfoMapper.insertOrUpdate(lineInfoParam); + } } 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 f7852c67d..020a85e42 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,14 +1,12 @@ package com.cool.store.service.impl; import com.cool.store.dao.HyOpenAreaInfoDAO; +import com.cool.store.dao.LineInfoDAO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.MemberQuestionDO; import com.cool.store.entity.PartnerBaseInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.WorkflowStageEnum; -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.HyOpenAreaInfoMapper; import com.cool.store.mapper.JoinIntentionMapper; @@ -39,7 +37,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt JoinIntentionMapper joinIntentionMapper; @Resource - LineInfoMapper lineInfoMapper; + LineInfoDAO lineInfoDAO; @Resource HyOpenAreaInfoMapper openAreaInfoMapper; @@ -60,7 +58,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt } //todo 目前写死为进入私海 lineInfoParam.setLineStatus(1); - lineInfoMapper.insertOrUpdate(lineInfoParam); + lineInfoDAO.insertOrUpdate(lineInfoParam); MemberQuestionDO memberQuestionDO = request.toMemberQuestionDO(); memberQuestionDO.setLineId(lineInfoParam.getId()); @@ -78,24 +76,31 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt protected Boolean auditPass(Long auditId, LineInfoDO lineInfo) { WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); - Integer nextStageInitStatus = nextStage.getInitStatus().getCode(); - return null; + lineInfo.setWorkflowSubStage(nextStage.getCode()); + lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INVITING_INTERVIEWS_10.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; } @Override protected Boolean auditReject(Long auditId, LineInfoDO lineInfo) { - return null; + lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_7.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; } + @Override protected Boolean auditClose(Long auditId, LineInfoDO lineInfo) { - return null; + lineInfo.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; } @Override public PartnerBaseInfoVO getByLineId(Long lineId) { MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId); - LineInfoDO byLineId = lineInfoMapper.getByLineId(lineId); + LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId); if (Objects.isNull(result)) { throw new ServiceException(LINE_ID_IS_NOT_EXIST); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java index 6b14e1dc8..b523b1502 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java @@ -15,7 +15,7 @@ import javax.annotation.Resource; * @Date 2024/3/28 14:25 * @Version 1.0 */ -@Api("PC OSS配置") +@Api(tags ="PC OSS配置") @RestController @RequestMapping({"/pc/oss"}) @Slf4j diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java index 3cab3f39b..417c90621 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java @@ -16,7 +16,7 @@ import javax.annotation.Resource; * @Version 1.0 */ @RestController -@Api("小程序OSS配置") +@Api(tags ="小程序OSS配置") @RequestMapping({"/mini/oss"}) @Slf4j public class MiniOssClientController {