diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java index 84ba8b39d..aa29f55b4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java @@ -48,4 +48,7 @@ public interface LinePayMapper { */ List getLinePayByLineIds(@Param("lineIds") List lineIds); + void updateByPidAndLid(@Param("lineId") Long lineId, + @Param("partnerId") String partnerId, + @Param("auditId") Long auditId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index 7ed6b19f9..c17e94300 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -215,6 +215,12 @@ where id = #{id,jdbcType=BIGINT} + + update xfsg_line_pay + set audit_id = #{auditId} + where line_id = #{lineId} + and partner_id = #{partnerId} + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java index 89bf28d1c..28bd4571b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java @@ -2,6 +2,7 @@ package com.cool.store.service; import com.cool.store.entity.BankdocDO; import com.cool.store.entity.BanktypeDO; +import com.cool.store.request.AuditRejectRequest; import com.cool.store.request.BranchBankPageRequest; import com.github.pagehelper.PageInfo; @@ -16,4 +17,6 @@ public interface BankService { PageInfo listBranchBank(BranchBankPageRequest request); + Boolean repayment(AuditRejectRequest request); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java index ee4a357f8..ce4e34075 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java @@ -1,13 +1,19 @@ package com.cool.store.service.impl; +import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.BankDAO; +import com.cool.store.dao.LineAuditInfoDAO; import com.cool.store.dao.LineInfoDAO; import com.cool.store.entity.BankdocDO; import com.cool.store.entity.BanktypeDO; +import com.cool.store.entity.LineAuditInfoDO; import com.cool.store.entity.LineInfoDO; +import com.cool.store.enums.AuditResultTypeEnum; import com.cool.store.enums.LineStatusEnum; import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; +import com.cool.store.mapper.LinePayMapper; +import com.cool.store.request.AuditRejectRequest; import com.cool.store.request.BranchBankPageRequest; import com.cool.store.service.BankService; import com.github.pagehelper.Page; @@ -34,6 +40,12 @@ public class BankServiceImpl extends LineFlowService implements BankService { @Resource LineInfoDAO lineInfoDAO; + @Resource + LinePayMapper linePayMapper; + + @Resource + private LineAuditInfoDAO lineAuditInfoDAO; + @Override public List listBank() { List bankList = bankDAO.listBank(); @@ -77,4 +89,27 @@ public class BankServiceImpl extends LineFlowService implements BankService { protected Boolean auditClose(Long auditId, LineInfoDO lineInfo) { return Boolean.TRUE; } + + @Override + public Boolean repayment(AuditRejectRequest request) { + //更新线索 + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); + lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_FAIL_55.getCode()); + lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.PAY_DEPOSIT.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + //插入线索审核信息 + String partnerId = lineInfo.getPartnerId(); + LineAuditInfoDO auditInfo = new LineAuditInfoDO(); + auditInfo.setLineId(request.getLineId()); + auditInfo.setPartnerId(partnerId); + auditInfo.setResultType(AuditResultTypeEnum.REJECT.getCode()); + auditInfo.setRejectPublicReason(request.getRejectPublicReason()); + auditInfo.setRejectRealReason(request.getRejectRealReason()); + auditInfo.setCertifyFile(JSONObject.toJSONString(request.getCertifyFile())); + Long auditId = lineAuditInfoDAO.addAuditInfo(auditInfo); + linePayMapper.updateByPidAndLid(request.getLineId(),lineInfo.getPartnerId(),auditId); + + return Boolean.TRUE; + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineAuditController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineAuditController.java index b530bb629..7a7a3f418 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineAuditController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineAuditController.java @@ -7,6 +7,7 @@ import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.request.AuditPassRequest; import com.cool.store.request.AuditRejectRequest; import com.cool.store.response.ResponseResult; +import com.cool.store.service.BankService; import com.cool.store.service.impl.CommonService; import com.cool.store.service.impl.LineFlowService; import com.cool.store.service.impl.LineInterviewServiceImpl; @@ -35,6 +36,9 @@ public class LineAuditController { @Resource private CommonService commonService; + @Resource + BankService bankService; + @ApiOperation("审核通过") @PostMapping("/pass") public ResponseResult auditPass(@RequestBody AuditPassRequest request){ @@ -47,6 +51,12 @@ public class LineAuditController { return ResponseResult.success(commonService.getLineFlowService(request.getWorkflowSubStage()).auditReject(request)); } + @ApiOperation("重新缴费") + @PostMapping("/repayment") + public ResponseResult repayment(@RequestBody AuditRejectRequest request){ + return ResponseResult.success(bankService.repayment(request)); + } + @ApiOperation("结束跟进") @PostMapping("/close") public ResponseResult auditClose(@RequestBody AuditRejectRequest request){