diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditStageEnum.java new file mode 100644 index 000000000..12559b2f4 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditStageEnum.java @@ -0,0 +1,39 @@ +package com.cool.store.enums; + +public enum AuditStageEnum { + + ONE(1, "一审稽核"), + TWO(2, "二审稽核"), + + + ; + + + private Integer code; + + private String name; + + AuditStageEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + + public Integer getCode() { + return code; + } + + public String getName() { + return name; + } + + public static AuditStageEnum getByCode(Integer code) { + for (AuditStageEnum auditStatusEnum : AuditStageEnum.values()) { + if (auditStatusEnum.getCode().equals(code)) { + return auditStatusEnum; + } + } + return null; + } + +} + diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java new file mode 100644 index 000000000..6009370c4 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java @@ -0,0 +1,9 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.AuditStatusDO; +import tk.mybatis.mapper.common.Mapper; + +@org.apache.ibatis.annotations.Mapper +public interface AuditStatusMapper extends Mapper { + +} diff --git a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml new file mode 100644 index 000000000..1457e76d1 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + id, + line_id, + interview_id, + audit_id, + audit_status, + audit_user_id, + audit_user_name, + create_time, + update_time, + audit_stage + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/AuditStatusDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/AuditStatusDO.java new file mode 100644 index 000000000..7392fa34e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/AuditStatusDO.java @@ -0,0 +1,32 @@ +package com.cool.store.entity; + +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +@Data +@Table(name = "xfsg_audit_status") +public class AuditStatusDO { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @Column(name = "line_id") + private Long lineId; + @Column(name = "interview_id") + private Long interviewId; + @Column(name = "audit_id") + private Long auditId; + @Column(name = "audit_status") + private Integer auditStatus; + @Column(name = "audit_user_id") + private Integer auditUserId; + @Column(name = "audit_user_name") + private String auditUserName; + @Column(name = "create_time") + private Date createTime; + @Column(name = "update_time") + private Date updateTime; + @Column(name = "audit_stage") + private Integer auditStage; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java new file mode 100644 index 000000000..6f1c48f41 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java @@ -0,0 +1,25 @@ +package com.cool.store.service; + +import com.cool.store.entity.AuditStatusDO; + +import java.util.List; + +public interface AuditStatusService { + + List list(); + + /** + * 稽核 + * @return + */ + Boolean audit(); + + /** + *插入数据 + * @return + */ + int insert(Long lineId, + Long interviewId, + Long auditId, + Integer auditStage); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java new file mode 100644 index 000000000..8e542e62e --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java @@ -0,0 +1,39 @@ +package com.cool.store.service.impl; + +import com.cool.store.entity.AuditStatusDO; +import com.cool.store.mapper.AuditStatusMapper; +import com.cool.store.service.AuditStatusService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Slf4j +public class AuditStatusServiceImpl implements AuditStatusService { + + @Resource + AuditStatusMapper auditStatusMapper; + + @Override + public List list() { + return null; + } + + @Override + public Boolean audit() { + return null; + } + + @Override + public int insert(Long lineId, Long interviewId, Long auditId,Integer auditStage) { + AuditStatusDO auditStatusDO = new AuditStatusDO(); + auditStatusDO.setLineId(lineId); + auditStatusDO.setInterviewId(interviewId); + auditStatusDO.setAuditId(auditId); + auditStatusDO.setAuditStage(auditStage); + int result = auditStatusMapper.insertSelective(auditStatusDO); + return result; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index dab08e12a..4f29afba1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -222,7 +222,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(lineInfoDO.getWantShopAreaId()); franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId())); franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId())); - //操作人工号 暂时写死 + //todo 操作人工号 暂时写死 LoginUserInfo user = CurrentUserHolder.getUser(); franchiseeDO.setOperator("22090043"); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, franchiseeDO, InitiatingResponse.class); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 3e9746c7a..2e8f2a421 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.dto.interview.LineInterviewPageDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.AuditStatusMapper; import com.cool.store.request.*; import com.cool.store.service.*; import com.cool.store.utils.TRTCUtils; @@ -74,6 +75,9 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt @Resource private ShopService shopService; + @Resource + AuditStatusService auditStatusService; + @Override public List getAppointmentTime(Long lineId, Integer interviewType, LocalDate appointmentDate) { InterviewTypeEnum interviewTypeEnum = InterviewTypeEnum.match(interviewType); @@ -404,6 +408,8 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt if(!WorkflowSubStageEnum.SECOND_INTERVIEWS.equals(workflowSubStageEnum)){ //更新线索阶段 lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus()); + //一审稽核 + auditStatusService.insert(lineInfo.getId(),interviewInfo.getId(),auditId,AuditStageEnum.ONE.getCode()); }else{ LineInfoDO updateLine = new LineInfoDO(); updateLine.setId(lineInfo.getId()); @@ -415,6 +421,8 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt lineInfoDAO.updateLineInfo(updateLine); //初始化店铺 shopService.initShop(lineInfo); + //二审稽核 + auditStatusService.insert(lineInfo.getId(),interviewInfo.getId(),auditId,AuditStageEnum.TWO.getCode()); } return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0; }