RequirementsDao(update)

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

@@ -87,25 +87,21 @@ public interface RequirementsDao {
 
     void arriveAtTheScene(ServiceArriveSceneDO serviceArriveSceneDO);
 
-    void updateScene(Integer requirementsInfoId);
+    void updateScene(Integer requirementsInfoId, Integer serviceFlowId);
 
     ServiceArriveSceneDO arriveAtTheSceneDetails(Integer requirementsInfoId, Integer userAccountId);
 
     void fulfilATask(ServiceFulfilATaskDO serviceFulfilATaskDO);
 
-    void updateFulfilATask(Integer requirementsInfoId);
 
     ServiceFulfilATaskDO fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
 
     void settleAccounts(ServiceSettleAccountsDO settleAccountsDO);
 
-    void updatesettleAccounts(Integer requirementsInfoId);
-
     ServiceSettleAccountsDO settleAccountsDetails(Integer requirementsInfoId, Integer userAccountId);
 
     void evaluate(ServiceEvaluateDO serviceEvaluateDO);
     
-    void updateEvaluate(Integer requirementsInfoId);
 
     ServiceEvaluateDO evaluateDetails(Integer requirementsInfoId, Integer userAccountId);
 
@@ -120,4 +116,7 @@ public interface RequirementsDao {
     List<FlowDictionaryDO> flowDictionary();
 
     void addAmount(RequirementsAmountDO requirementsAmountDO);
+
+
+    void updateInfo(Integer requirementsInfoId, Integer serviceFlowId);
 }

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

@@ -589,7 +589,8 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody cancelAll(Integer requirementsInfoId, Integer userAccountId) {
         RequirementsServiceDO requirementsServiceDO = requirementsDao.droneFlyerCancel(requirementsInfoId, userAccountId);
         RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(requirementsInfoId, userAccountId);
-
+        requirementsDao.updateInfo(requirementsInfoId, 7);
+        requirementsDao.updateScene(requirementsInfoId, 7);
         return ResultBody.success();
     }
 
@@ -966,7 +967,8 @@ public class RequirementsServiceImpl implements RequirementsService {
             return ResultBody.error(ResultEnum.FALL_OUTSIDE_OF);
         } else {
             requirementsDao.arriveAtTheScene(serviceArriveSceneDO);
-            requirementsDao.updateScene(serviceArriveSceneDO.getRequirementsInfoId());
+            requirementsDao.updateScene(serviceArriveSceneDO.getRequirementsInfoId(), 3);
+            requirementsDao.updateInfo(serviceArriveSceneDO.getRequirementsInfoId(), 3);
         }
         return ResultBody.success();
     }
@@ -990,7 +992,8 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody fulfilATask(ServiceFulfilATaskVO fulfilATaskVO) {
         ServiceFulfilATaskDO serviceFulfilATaskDO = new ServiceFulfilATaskDO(fulfilATaskVO);
         requirementsDao.fulfilATask(serviceFulfilATaskDO);
-        requirementsDao.updateFulfilATask(fulfilATaskVO.getRequirementsInfoId());
+        requirementsDao.updateInfo(fulfilATaskVO.getRequirementsInfoId(), 4);
+        requirementsDao.updateScene(fulfilATaskVO.getRequirementsInfoId(), 4);
         return ResultBody.success();
     }
 
@@ -1006,7 +1009,9 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody settleAccounts(ServiceSettleAccountsVO settleAccountsVO) {
         ServiceSettleAccountsDO settleAccountsDO = new ServiceSettleAccountsDO(settleAccountsVO);
         requirementsDao.settleAccounts(settleAccountsDO);
-        requirementsDao.updatesettleAccounts(settleAccountsVO.getRequirementsInfoId());
+        requirementsDao.updateScene(settleAccountsVO.getRequirementsInfoId(), 5);
+        requirementsDao.updateInfo(settleAccountsVO.getRequirementsInfoId(), 5);
+
         return ResultBody.success();
     }
 
@@ -1021,7 +1026,8 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody evaluate(ServiceEvaluateVO evaluateVO) {
         ServiceEvaluateDO serviceEvaluateDO = new ServiceEvaluateDO(evaluateVO);
         requirementsDao.evaluate(serviceEvaluateDO);
-        requirementsDao.updateEvaluate(evaluateVO.getRequirementsInfoId());
+        requirementsDao.updateInfo(evaluateVO.getRequirementsInfoId(), 6);
+        requirementsDao.updateScene(evaluateVO.getRequirementsInfoId(), 6);
         return ResultBody.success();
     }
 

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

@@ -233,7 +233,7 @@
                ri.require_description,
                ri.requirement_type_id,
                ri.user_account_id,
-               ri.order_level,
+               ra.order_level,
                ri.service_id,
                ra.total_amount,
                ra.order_amount,
@@ -276,9 +276,11 @@
                ra.order_amount,
                ra.update_order_amount,
                ra.reason,
-               ra.url
+               ra.url,
+               ra.order_level
         FROM requirements_info ri
-                 LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
+                 LEFT JOIN requirements_type rt
+                           ON rt.id = ri.requirement_type_id
                  LEFT JOIN service_flow sf ON sf.order_status = ri.service_flow_id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
             AND ra.user_account_id = ri.user_account_id
@@ -291,11 +293,11 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode)
+                                      service_flow_id, adcode, order_level_amount)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
-                #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode});
+                #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount});
     </insert>
 
     <insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"
@@ -339,17 +341,18 @@
     <update id="updateGrabTheOrder">
         UPDATE requirements_info
         set repertory=#{repertory},
+            service_flow_id = 2,
             update_time=NOW()
         where publisher_number = #{publisherNumber}
     </update>
 
     <insert id="insertService" parameterType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO"
             keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO requirements_service(requirements_info_id, service_dictionary_id, pilot_certification_id,
+        INSERT INTO requirements_service(requirements_info_id, pilot_certification_id,
                                          pilot_certification_user_id, team_id, team_user_id, cash_amount, we_chat,
                                          salary_amount,
                                          wechat_pay_order_number, service_flow_id, preempt_total_amount)
-        VALUES (#{requirementsInfoId}, #{serviceDictionaryId}, #{pilotCertificationId}, #{pilotCertificationUserId},
+        VALUES (#{requirementsInfoId}, #{pilotCertificationId}, #{pilotCertificationUserId},
                 #{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber}, 2,
                 preemptTotalAmount);
     </insert>
@@ -363,11 +366,16 @@
     </insert>
     <update id="updateScene">
         UPDATE requirements_service
-        set service_dictionary_id=5,
-            service_flow_id=1,
+        set service_flow_id=#{serviceFlowId},
             update_time=NOW()
         where requirements_info_id = #{requirementsInfoId}
+    </update>
 
+    <update id="updateInfo">
+        UPDATE requirements_info
+        set service_flow_id=#{serviceFlowId},
+            update_time=NOW()
+        where requirements_info_id = #{requirementsInfoId}
     </update>
 
     <select id="arriveAtTheSceneDetails" resultType="com.mmc.csf.release.entity.requirements.ServiceArriveSceneDO">
@@ -392,13 +400,7 @@
         VALUES (#{taskDescribe}, #{taskUrl}, NOW(), NOW(), #{userAccountId},
                 #{requirementsInfoId});
     </insert>
-    <update id="updateFulfilATask">
-        UPDATE requirements_service
-        set service_dictionary_id=5,
-            service_flow_id=2,
-            update_time=NOW()
-        where requirements_info_id = #{requirementsInfoId}
-    </update>
+
     <select id="fulfilATaskDetails" resultType="com.mmc.csf.release.entity.requirements.ServiceFulfilATaskDO">
         select id, task_describe, task_url, create_time, update_time, requirements_info_id, user_account_id
         from service_fulfil_a_task
@@ -412,13 +414,7 @@
         VALUES (#{orderAmount}, #{requirementsInfoId}, #{remark}, NOW(), NOW());
     </insert>
 
-    <update id="updatesettleAccounts">
-        UPDATE requirements_service
-        set service_dictionary_id=4,
-            service_flow_id=3,
-            update_time=NOW()
-        where requirements_info_id = #{requirementsInfoId}
-    </update>
+
     <select id="settleAccountsDetails" resultType="com.mmc.csf.release.entity.requirements.ServiceSettleAccountsDO">
         select id, order_amount, requirements_info_id, remark, create_time, update_time
         from service_settle_accounts
@@ -432,13 +428,7 @@
         VALUES (#{evaluationContent}, #{starLevel}, #{evaluationUrl}, NOW(), NOW(), #{requirementsInfoId},
                 #{userAccountId});
     </insert>
-    <update id="updateEvaluate">
-        UPDATE requirements_service
-        set service_dictionary_id=4,
-            service_flow_id= 4,
-            update_time=NOW()
-        where requirements_info_id = #{requirementsInfoId}
-    </update>
+
     <select id="evaluateDetails" resultType="com.mmc.csf.release.entity.requirements.ServiceEvaluateDO">
         select id,
                evaluation_content,