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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-10 14:53:32 +08:00
parent 820c6eb987 aed9273e58
commit d48d09482a
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -88,6 +88,7 @@ public enum ErrorCodeEnum {
POINT_AUDIT_NODE_ERROR(600005, "当前审批任务异常", null),
USER_NOT_TODO_AUDIT(600005, "当前用户没有待审批的任务", null),
NOT_ALLOW_MODIFY_WANT_SHOP_NUM(600006, "当前阶段不允许直接修改意向开店数量", null),
USER_NOT_ALLOW_ENTER_ROOM(600007, "当前用户不允许进入面试房间", null),
INTERVIEW_ENTER_FAIL(1021101, "进入面审间失败", null),
DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),

2
coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml
View File

@@ -113,7 +113,7 @@
</select>
<select id="getWaitAuditInterview" resultMap="BaseResultMap">
select id, line_id from xfsg_line_interview where interview_status = 1 and deleted = '0' and interview_type = 0 and now() >= end_time
select id, line_id from xfsg_line_interview where interview_status = 1 and deleted = '0' and interview_type = 0 and now() >= start_time
</select>
<update id="batchUpdateInterviewStatus">

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
View File

@@ -264,6 +264,12 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
if (interviewInfo.getRoomStatus().equals(RoomStatus.CLOSED.getCode())) {
throw new ServiceException(ErrorCodeEnum.ROOM_STATUS_ERROR);
}
if(InterviewUserTypeEnum.INTERVIEWER.equals(userType) && !interviewUserId.equals(interviewInfo.getInterviewerUserId())){
throw new ServiceException(ErrorCodeEnum.USER_NOT_ALLOW_ENTER_ROOM);
}
if(InterviewUserTypeEnum.LINE.equals(userType) && !interviewUserId.equals(interviewInfo.getPartnerId())){
throw new ServiceException(ErrorCodeEnum.USER_NOT_ALLOW_ENTER_ROOM);
}
String userName = enterpriseUserDAO.getUserName(interviewInfo.getInterviewerUserId());
Long lineId = interviewInfo.getLineId();
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
@@ -425,8 +431,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
@Override
protected Boolean auditClose(Long auditId, LineInfoDO lineInfo) {
auditReject(auditId, lineInfo);
return true;
return Boolean.TRUE;
}
}

8
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java
View File

@@ -33,14 +33,14 @@ public class PCIntentAgreementController {
@PostMapping(path = "/initiating")
@ApiOperation("kdz -> xfsg 发起意向协议流程")
public ResponseResult<InitiatingResponse> initiating(@RequestBody InitiatingRequest request) {
return ResponseResult.success(intentAgreementService.initiating(request));
public InitiatingResponse initiating(@RequestBody InitiatingRequest request) {
return intentAgreementService.initiating(request);
}
@PostMapping(path = "/franchisee/save")
@ApiOperation("kdz -> xfsg 加盟商新增")
public ResponseResult<InitiatingResponse> save(@RequestBody FranchiseeSaveRequest request) {
return ResponseResult.success(intentAgreementService.save(request));
public InitiatingResponse save(@RequestBody FranchiseeSaveRequest request) {
return intentAgreementService.save(request);
}