Requirements(update)

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

@@ -109,4 +109,11 @@ public class ServiceOrderFormDetailsDTO {
 
     @ApiModelProperty(value = "状态", example = "100")
     private String orderStatus;
+
+
+    @ApiModelProperty(value = "判定内容")
+    private String decisionContent;
+
+    @ApiModelProperty(value = "1:双方无责 2:发布者责任 3：飞手责任")
+    private Integer duty;
 }

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

@@ -210,4 +210,6 @@ public interface RequirementsDao {
     int selectInfo(Integer id);
 
     void customerServiceIntervention(LiabilityProblemVO liabilityProblemVO);
+
+    int selectCustomer(Integer requirementsInfoId);
 }

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

@@ -106,6 +106,13 @@ public class ServiceOrderFormDetailsDO {
     private BigDecimal orderEarnings;
 
 
+    @ApiModelProperty(value = "判定内容")
+    private String decisionContent;
+
+    @ApiModelProperty(value = "1:双方无责 2:发布者责任 3：飞手责任")
+    private Integer duty;
+
+
     public ServiceOrderFormDetailsDTO buildOrderFormDetails() {
         return ServiceOrderFormDetailsDTO.builder()
                 .id(this.id)
@@ -132,6 +139,8 @@ public class ServiceOrderFormDetailsDO {
                 .updateTime(this.updateTime)
                 .orderStatus(this.orderStatus)
                 .orderEarnings(this.orderEarnings)
+                .duty(this.duty)
+                .decisionContent(this.decisionContent)
                 .build();
     }
 }

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

@@ -1250,6 +1250,11 @@ public class RequirementsServiceImpl implements RequirementsService {
         RequirementsServiceDO requirementsServiceDO = requirementsDao.customerDroneFlyerCancel(liabilityProblemVO.getRequirementsInfoId());
         RequirementsInfoDO requirementsInfoDO = requirementsDao.customerPublisherCancel(liabilityProblemVO.getRequirementsInfoId(), userAccountId);
         liabilityProblemVO.setUserAccountId(userAccountId);
+        int i = requirementsDao.selectCustomer(liabilityProblemVO.getRequirementsInfoId());
+        if (i!=0){
+            return ResultBody.error("请勿重复判定");
+        }
+
         requirementsDao.customerServiceIntervention(liabilityProblemVO);
 
         //双方无责

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

@@ -27,6 +27,8 @@
         <result property="orderStatus" column="order_status"/>
         <result property="doing" column="doing"/>
         <result property="orderEarnings" column="order_earnings"/>
+        <result property="duty" column="duty"/>
+        <result property="decisionContent" column="decision_content"/>
         <collection property="orderEarningsDTO" ofType="com.mmc.csf.infomation.dto.PlatformOrderEarningsDTO"
                     select="selectOrderEarnings"
                     column="{requirementsInfoId=id}">
@@ -109,34 +111,38 @@
     </select>
 
     <select id="serviceOrderFormDetails" resultMap="serviceDetails">
-        SELECT ri.id,
-               ri.create_time,
-               ri.update_time,
-               ri.service_id,
-               ri.service_name,
-               ri.publisher_number,
-               ra.order_amount,
-               ri.task_start_time,
-               ri.task_end_time,
-               ri.task_address,
-               ri.latitude,
-               ri.longitude,
-               ra.cash_amount,
-               ra.salary_amount,
-               ra.we_chat,
-               rs.cash_amount   AS preemptCashAmount,
-               rs.salary_amount AS preemptSalaryAmount,
-               rs.we_chat       AS preemptWeChat,
-               ra.update_order_amount,
-               ri.require_description,
-               sf.order_status,
-               sf.doing,
-               ra.order_earnings
-        FROM requirements_info ri
-                 LEFT JOIN requirements_amount ra
-                           ON ri.id = ra.requirements_info_id
-                 LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
-                 LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
+        SELECT
+            ri.id,
+            ri.create_time,
+            ri.update_time,
+            ri.service_id,
+            ri.service_name,
+            ri.publisher_number,
+            ra.order_amount,
+            ri.task_start_time,
+            ri.task_end_time,
+            ri.task_address,
+            ri.latitude,
+            ri.longitude,
+            ra.cash_amount,
+            ra.salary_amount,
+            ra.we_chat,
+            rs.cash_amount AS preemptCashAmount,
+            rs.salary_amount AS preemptSalaryAmount,
+            rs.we_chat AS preemptWeChat,
+            ra.update_order_amount,
+            ri.require_description,
+            sf.order_status,
+            sf.doing,
+            ra.order_earnings,
+            csi.decision_content,
+            csi.duty
+        FROM
+            requirements_info ri
+                LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
+                LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
+                LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
+                LEFT JOIN customer_service_intervention csi ON csi.requirements_info_id = ri.id
         WHERE ri.id = #{requirementsInfoId}
     </select>
 

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

@@ -115,6 +115,10 @@
         values (#{requirementsInfoId}, NOW(), NOW(), #{userAccountId}, #{decisionContent},#{duty})
     </insert>
 
+    <select id="selectCustomer" resultType="java.lang.Integer">
+        select count(*) from customer_service_intervention where requirements_info_id=#{requirementsInfoId}
+    </select>
+
     <update id="updatePlatformOrderEarnings">
         update platform_order_earnings
         set liquidated_damages=#{earnings},