派单订单详情

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

@@ -98,6 +98,7 @@ public interface RequirementsDao {
 
     RequirementsInfoDO detailPublish(Integer id);
 
+    RequirementsInfoDO detailSendPublish(Integer id);
     /**
      * 获取被拒绝飞手具体订单信息
      * @param id 订单id

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

@@ -227,11 +227,15 @@ public class RequirementsServiceImpl implements RequirementsService {
         if(pilotStatus != null && pilotStatus == 11) {
             //获取被拒绝订单详情
             requirementsInfoDO = requirementsDao.selectDetailRefusePilotInfo(id);
-            requirementsInfoVO = requirementsInfoDO.buildRequirementsInfoVO();
-        }else{
+        } else if (pilotStatus == 13) {
+
+            requirementsInfoDO = requirementsDao.detailSendPublish(id);
+
+        }else
+        {
             requirementsInfoDO = requirementsDao.detailPublish(id);
-            requirementsInfoVO = requirementsInfoDO.buildRequirementsInfoVO();
         }
+        requirementsInfoVO = requirementsInfoDO.buildRequirementsInfoVO();
         if (userAccountId.equals(requirementsInfoVO.getUserAccountId())) {
             requirementsInfoVO.setParamMoney(BigDecimal.valueOf(0.00));
         } else if (!userAccountId.equals(requirementsInfoVO.getUserAccountId())) {

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

@@ -2086,6 +2086,53 @@
         from requirements_info
         where id = #{requireId} and repertory = require_num
     </select>
+    <select id="detailSendPublish" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
+        SELECT ri.id,
+               ri.task_title,
+               ri.task_start_time,
+               ri.task_end_time,
+               ri.task_address,
+               ri.longitude,
+               ri.latitude,
+               ri.require_url,
+               ri.require_description,
+               ri.requirement_type_id,
+               ri.user_account_id,
+               rt.type_name                   AS requirementTypeName,
+               ri.publish_phone,
+               ri.publisher_number,
+               ri.service_id,
+               ri.repertory,
+               ri.require_num,
+               ri.father_require_id,
+               ra.total_amount,
+               ri.insurance,
+               sf.doing,
+               sf.waiting,
+               sf.user_port,
+               sf.flyer_port,
+               sf.order_status,
+               ri.publish,
+               ra.order_amount,
+               rau.update_order_amount,
+               ra.reason,
+               ra.url,
+               ra.order_level,
+               rau.reason                     AS afterModificationReason,
+               rau.url                        AS afterModificationUrl,
+               rs.pilot_certification_user_id AS pilotCertificationUserId,
+               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
+                 LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
+                 LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
+                 LEFT JOIN requirements_service_temp rs ON rs.requirements_info_id = ri.id
+                 LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+            AND ra.user_account_id = ri.user_account_id
+        WHERE ri.id = #{id} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
+    </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>