新加流程 以及我的抢单显示被拒绝的订单

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

+package com.mmc.csf.infomation.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author 张培
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AgreePilotOrderDTO {
+
+    @ApiModelProperty(value = "订单id")
+    private Integer requirementsInfoId;
+
+    @ApiModelProperty(value = "状态")
+    private Integer serviceFlowId;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private FlowDictionaryDTO flowDictionaryDTO;
+}

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

@@ -163,6 +163,8 @@ public interface RequirementsDao {
 
     ServiceArriveSceneDTO serviceArriveSceneDTO(Integer requirementsInfoId);
 
+    AgreePilotOrderDTO serviceAgreePilotOrderDTO(Integer requirementsInfoId);
+
     ServiceFulfilATaskDTO serviceFulfilATaskDTO(Integer requirementsInfoId);
 
     ServiceSettleAccountsDTO settleAccountsDTO(Integer requirementsInfoId);
@@ -239,10 +241,10 @@ public interface RequirementsDao {
     Integer updateRequirementsInfoRepertory(Integer fatherRequireId,Integer fatherRepertory);
 
     /**
-     * 查找用户有没有已经抢到这个订单了
+     * 查找用户有没有已经抢过这个多人订单了
      * @param fatherRequireId 父订单id
      * @param userId 抢单用户id
-     * @return {@link Integer}1 就是已经抢到这个订单了 0 就是没抢过
+     * @return {@link Integer}1 就是已经抢过这个订单了 0 就是没抢过
      */
     Integer selectBooleanByFatherIdAndUserId(Integer fatherRequireId,Integer userId);
 

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

@@ -2264,6 +2264,9 @@ public class RequirementsServiceImpl implements RequirementsService {
         //抢单
         RequirementsServiceDTO requirementsServiceDTO = requirementsDao.requirementsServiceDTO(requirementsInfoId);
         flowDictionaryAndTimeDTO.setRequirementsServiceDTO(requirementsServiceDTO);
+        //发单方同意或者拒绝
+        AgreePilotOrderDTO agreePilotOrderDTO = requirementsDao.serviceAgreePilotOrderDTO(requirementsInfoId);
+        flowDictionaryAndTimeDTO.setAgreePilotOrderDTO(agreePilotOrderDTO);
         //抵达现场
         ServiceArriveSceneDTO arriveSceneDTO = requirementsDao.serviceArriveSceneDTO(requirementsInfoId);
         flowDictionaryAndTimeDTO.setServiceArriveSceneDTO(arriveSceneDTO);
@@ -2854,6 +2857,8 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (grabTheOrderVO.getRequirementsInfoId().equals(requirementsInfoDO.getId()) && grabTheOrderVO.getUserAccountId().equals(requirementsInfoDO.getUserAccountId())) {
             return ResultBody.error("自己不能抢自己发布的需求");
         }
+        // TODO 一人订单被拒绝也不能再次抢单
+
         //飞手
         PilotCertificationInteriorDTO pilot = feignInteriorDetailPilot(grabTheOrderVO.getUserAccountId(), request);
         if (pilot == null) {

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

@@ -1295,6 +1295,16 @@
         </collection>
     </resultMap>
 
+    <resultMap id="serviceAgreePilotOrderMap" type="com.mmc.csf.infomation.dto.AgreePilotOrderDTO">
+        <result property="createTime" column="create_time"/>
+        <result property="requirementsInfoId" column="require_info_id"/>
+        <result property="serviceFlowId" column="service_flow_id"/>
+        <collection property="flowDictionaryDTO" ofType="com.mmc.csf.infomation.dto.FlowDictionaryDTO"
+                    select="selectServiceFlow"
+                    column="{serviceFlowId=service_flow_id}">
+        </collection>
+    </resultMap>
+
     <resultMap id="settleAccountsMap" type="com.mmc.csf.infomation.dto.ServiceSettleAccountsDTO">
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -1374,6 +1384,11 @@
         where requirements_info_id = #{requirementsInfoId}
     </select>
 
+    <select id="serviceAgreePilotOrderDTO" resultMap="serviceAgreePilotOrderMap">
+            select require_info_id,create_time,service_flow_id from agree_pilot_order
+            where service_flow_id = 2 and require_info_id = #{requirementsInfoId}
+    </select>
+
     <select id="serviceFulfilATaskDTO" resultMap="serviceFulfilATaskMap">
         SELECT id,
                task_describe,