ReleaseSuccessDTO(add)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/FlowDictionaryAndTimeDTO.java

@@ -19,6 +19,10 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class FlowDictionaryAndTimeDTO implements Serializable {
 
+
+    @ApiModelProperty(value = "发布成功", example = "发布成功")
+    private ReleaseSuccessDTO releaseSuccess;
+
     //抢单
     @ApiModelProperty(value = "抢单", example = "抢单")
     private RequirementsServiceDTO requirementsServiceDTO;

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ReleaseSuccessDTO.java

+package com.mmc.csf.infomation.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/8/30 15:12
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReleaseSuccessDTO {
+    @ApiModelProperty(value = "服务id", example = "服务id")
+    private Integer requirementsInfoId;
+
+
+    /**
+     * 抢单时间
+     */
+    @ApiModelProperty(value = "抢单时间", example = "抢单时间")
+    private String createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "更新时间", example = "更新时间")
+    private String updateTime;
+
+    @ApiModelProperty(value = "流程id", hidden = true)
+    private Integer serviceFlowId;
+
+
+    @ApiModelProperty(value = "流程字典", example = "流程字典")
+    private FlowDictionaryDTO flowDictionaryDTO;
+
+
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -178,4 +178,7 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "抢单飞手用户id ")
     private Integer pilotCertificationUserId;
 
+    @ApiModelProperty(value = "抢单飞手id")
+    private Integer pilotCertificationId;
+
 }

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -177,4 +177,6 @@ public interface RequirementsDao {
     void updateRequirementsAmount(RequirementsInfoDO requirementsInfoDO);
 
     void updateAmounts(RequirementsServiceDO requirementsServiceDO);
+
+    ReleaseSuccessDTO releaseSuccessDTO(Integer requirementsInfoId);
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -171,6 +171,9 @@ public class RequirementsInfoDO implements Serializable {
     @IsNullConvertZero
     private BigDecimal orderEarnings;
 
+    @ApiModelProperty(value = "抢单飞手id")
+    private Integer pilotCertificationId;
+
     public RequirementsInfoVO buildRequirementsInfoVO() {
         return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName)
                 .publishPhone(this.publishPhone).requireDescription(this.requireDescription).solved(this.solved).taskStartTime(this.taskStartTime).taskEndTime(this.taskEndTime)
@@ -201,6 +204,7 @@ public class RequirementsInfoDO implements Serializable {
                 .afterModificationUrl(this.afterModificationUrl)
                 .pilotCertificationUserId(this.pilotCertificationUserId)
                 .preemptPhone(this.preemptPhone)
+                .pilotCertificationId(this.pilotCertificationId)
                 .build();
 
     }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsServiceDO.java

@@ -82,6 +82,7 @@ public class RequirementsServiceDO implements Serializable {
     @IsNullConvertZero
     private BigDecimal orderEarnings;
 
+
     public RequirementsServiceDO(PilotCertificationInteriorDTO pilot, ServiceRequirementsDO requirementsInfoDO) {
         this.pilotCertificationId = pilot.getId();
         this.pilotCertificationUserId = pilot.getUserAccountId();

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -1436,6 +1436,10 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Override
     public ResultBody<FlowDictionaryAndTimeDTO> flowDictionaryAndTime(Integer requirementsInfoId) {
         FlowDictionaryAndTimeDTO flowDictionaryAndTimeDTO = new FlowDictionaryAndTimeDTO();
+
+        ReleaseSuccessDTO releaseSuccessDTO = requirementsDao.releaseSuccessDTO(requirementsInfoId);
+        flowDictionaryAndTimeDTO.setReleaseSuccess(releaseSuccessDTO);
+
         //抢单
         RequirementsServiceDTO requirementsServiceDTO = requirementsDao.requirementsServiceDTO(requirementsInfoId);
         flowDictionaryAndTimeDTO.setRequirementsServiceDTO(requirementsServiceDTO);
@@ -2273,7 +2277,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         }
         return ResultBody.success();
     }
-    
+
     public ResultBody feignWalletFlow(PublisherWalletFlowVO publisherWalletFlowVO, String token) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -42,10 +42,10 @@
                poe.update_time,
                poe.user_account_id,
                ra.order_level_amount,
-               ra.order_level_amount
+               ra.order_level
         FROM platform_order_earnings poe
-                 LEFT JOIN requirements_amount ra ON poe.requirements_info_id = ra.id
-        where poe.requirements_info_id = #{requirementsInfoId}
+                 LEFT JOIN requirements_amount ra ON poe.requirements_info_id = ra.requirements_info_id
+        WHERE ra.requirements_info_id = #{requirementsInfoId}
     </select>
 
 

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -99,6 +99,15 @@
         WHERE requirements_info_id = #{requirementsInfoId}
     </select>
 
+    <select id="releaseSuccessDTO" resultMap="releaseSuccessMap">
+        SELECT id,
+               create_time,
+               update_time,
+               service_flow
+        FROM requirements_info
+        WHERE id = #{requirementsInfoId}
+    </select>
+
     <update id="solveRequire">
         update requirements_info
         set is_solved = 1
@@ -414,7 +423,8 @@
                rau.reason                     AS afterModificationReason,
                rau.url                        AS afterModificationUrl,
                rs.pilot_certification_user_id AS pilotCertificationUserId,
-               rs.preempt_phone               AS preemptPhone
+               rs.preempt_phone               AS preemptPhone,
+               rs.pilot_certification_id
         FROM requirements_info ri
                  LEFT JOIN requirements_type rt
                            ON rt.id = ri.requirement_type_id
@@ -954,6 +964,17 @@
         </collection>
     </resultMap>
 
+    <resultMap id="releaseSuccessMap" type="com.mmc.csf.infomation.dto.ReleaseSuccessDTO">
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="requirementsInfoId" column="id"/>
+        <result property="serviceFlowId" column="service_flow"/>
+        <collection property="flowDictionaryDTO" ofType="com.mmc.csf.infomation.dto.FlowDictionaryDTO"
+                    select="selectServiceFlow"
+                    column="{serviceFlowId=service_flow}">
+        </collection>
+    </resultMap>
+
 
     <resultMap id="serviceEvaluateMap" type="com.mmc.csf.infomation.dto.ServiceEvaluateDTO">
         <result property="createTime" column="create_time"/>