From 8be6aa5c7cf4a3c805dc6495fcfcc923f433bf11 Mon Sep 17 00:00:00 2001
From: guohb <ghb01699725@alibaba-inc.com>
Date: Tue, 2 Apr 2024 16:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E6=84=8F=E5=90=91-=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=B5=81=E7=A8=8B=20=E5=8A=A0=E7=9B=9F=E6=84=8F?=
 =?UTF-8?q?=E5=90=91=E6=8B=92=E7=BB=9D=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/mapper/JoinIntentionMapper.java     |  3 +++
 .../resources/mapper/JoinIntentionMapper.xml  |  5 +++++
 .../com/cool/store/vo/PartnerBaseInfoVO.java  |  4 ++++
 .../impl/JoinIntentionServiceImpl.java        | 22 +++++++++++++++----
 .../webb/PCIntentAgreementController.java     |  3 +--
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java
index 015f9923e..a159bfafb 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/JoinIntentionMapper.java
@@ -15,4 +15,7 @@ public interface JoinIntentionMapper {
     MemberQuestionDO     getByLineId(@Param("lineId") Long lineId);
 
     List<MemberQuestionDO> getByLineIds(@Param("lineIds") List<Long> lineIds);
+
+    void updateAuditIdByLineId(@Param("auditId") Long auditId,
+                               @Param("lineId") Long id);
 }
diff --git a/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml
index 475dfe15c..e14dfd8d3 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/JoinIntentionMapper.xml
@@ -104,6 +104,11 @@
             <if test="request.canTraining != null">can_training = #{request.canTraining},</if>
         </trim>
     </insert>
+    <update id="updateAuditIdByLineId">
+        update xfsg_member_question_info
+        set audit_id = #{auditId}
+        where line_id = #{lineId}
+    </update>
 
     <select id="getByLineId" resultType="com.cool.store.entity.MemberQuestionDO">
         select
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java
index 7a932cc40..dfa54d416 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java
@@ -66,6 +66,10 @@ public class PartnerBaseInfoVO {
     private Integer deleted;
 
 
+    @ApiModelProperty("公开拒绝原因")
+    private String rejectPublicReason;
+
+
 
 
     public static PartnerBaseInfoVO from(MemberQuestionDO memberQuestionDO, LineInfoDO lineInfoDO) {
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 8a44b00db..f34a71b4a 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
@@ -2,14 +2,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.entity.*;
 import com.cool.store.enums.*;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.HyOpenAreaInfoMapper;
 import com.cool.store.mapper.JoinIntentionMapper;
+import com.cool.store.mapper.LineAuditInfoMapper;
 import com.cool.store.mapper.LineInfoMapper;
 import com.cool.store.request.JoinIntentionRequest;
 import com.cool.store.service.JoinIntentionService;
@@ -42,6 +40,10 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
     @Resource
     HyOpenAreaInfoMapper openAreaInfoMapper;
 
+
+    @Resource
+    LineAuditInfoMapper lineAuditInfoMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean submit(JoinIntentionRequest request) {
@@ -78,6 +80,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage();
         //更新线索阶段
         lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus());
+        //更新加盟问卷信息
+        joinIntentionMapper.updateAuditIdByLineId(auditId,lineInfo.getId());
         return Boolean.TRUE;
     }
 
@@ -85,6 +89,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
     protected Boolean auditReject(Long auditId, LineInfoDO lineInfo) {
         lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_7.getCode());
         lineInfoDAO.updateLineInfo(lineInfo);
+        //更新加盟问卷信息
+        joinIntentionMapper.updateAuditIdByLineId(auditId,lineInfo.getId());
         return Boolean.TRUE;
     }
 
@@ -98,12 +104,20 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
     public PartnerBaseInfoVO getByLineId(Long lineId) {
         MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId);
         LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId);
+
         if (Objects.isNull(result)) {
             throw new ServiceException(LINE_ID_IS_NOT_EXIST);
         }
         PartnerBaseInfoVO response = PartnerBaseInfoVO.from(result, byLineId);
         HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode()));
         response.setArea(openAreaInfoDO.getAreaPath());
+        if (Objects.nonNull(result.getAuditId())){
+            LineAuditInfoDO lineAuditInfoDO = lineAuditInfoMapper.selectByPrimaryKey(result.getAuditId());
+            if (Objects.isNull(lineAuditInfoDO)){
+                response.setRejectPublicReason(null);
+            }
+            response.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason());
+        }
         return response;
     }
 }
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java
index 295a43155..b6249d485 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java
@@ -32,8 +32,7 @@ public class PCIntentAgreementController {
 
     @PostMapping(path = "/initiating")
     @ApiOperation("kdz -> xfsg 发起意向协议流程")
-    public ResponseResult<InitiatingResponse> initiating(@RequestParam
-            @RequestBody InitiatingRequest request) {
+    public ResponseResult<InitiatingResponse> initiating(@RequestBody InitiatingRequest request) {
         return ResponseResult.success(intentAgreementService.initiating(request));
     }
 }