Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

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

@@ -471,6 +471,8 @@ public interface RequirementsDao {
 
     void updateSendOrder(PersonSendOrderDO personSendOrderDO);
 
+    void deleteSendOrder(Integer requirementsInfoId);
+
     /**
      * 管理员确认接单
      */

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

@@ -23,6 +23,7 @@ import com.mmc.csf.release.industry.IndustryTypeDTO;
 import com.mmc.csf.release.industry.UserPayInfoVO;
 import com.mmc.csf.release.service.RequirementsService;
 import com.mmc.csf.release.util.RestTemplateUtil;
+import com.mmc.csf.release.util.ScheduledTaskUtil;
 import com.mmc.csf.release.util.SmsUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -97,6 +98,9 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Autowired
     private OrderAmountDetailDao orderAmountDetailDao;
 
+    @Autowired
+    private ScheduledTaskUtil scheduledTaskUtil;
+
     @Override
     public ResultBody listType(Integer id) {
         List<RequirementsTypeDO> requirementsTypeDOList = requirementsDao.listTypeReq(id);
@@ -3364,6 +3368,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             // TODO 定时器 发送短信、公众号通知
             SmsUtil.sendPilotOrder(pilotPhone);
             requirementsDao.updateOrderRequireNum(personSendOrderVO.getRequirementsInfoId(),0);
+//            scheduledTaskUtil.create(personSendOrderVO);
             return ResultBody.success("派单成功，等待飞手确认");
         }
     }

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

@@ -1662,12 +1662,12 @@
     <update id="orderConfirmationByPilot">
         update requirements_service_temp
         set pilot_status = #{status}
-        where id = #{id}
+        where id = #{id} and is_deleted=0
     </update>
     <update id="orderConfirmationByTeam">
         update requirements_service_temp
         set team_status = #{status}
-        where requirements_info_id = #{id}
+        where requirements_info_id = #{id} and is_deleted=0
     </update>
 
     <update id="updateCount">
@@ -1684,7 +1684,12 @@
         update requirements_service_temp
         set pilot_certification_id = #{pilotCertificationId},
             pilot_certification_user_id = #{pilotCertificationUserId}
-        where requirements_info_id = #{requirementsInfoId}
+        where requirements_info_id = #{requirementsInfoId} and is_deleted=0
+    </update>
+    <update id="deleteSendOrder">
+        update requirements_service_temp
+        set is_deleted = 1
+        where requirements_info_id = #{requirementsInfoId} and is_deleted=0
     </update>
     <update id="updateOrderRequireNum">
         update requirements_info
@@ -1908,7 +1913,7 @@
     <select id="selectSendOrderById" resultType="com.mmc.csf.release.entity.information.PersonSendOrderDO">
         select *
         from requirements_service_temp
-        where id = #{id}
+        where id = #{id} and is_deleted=0
     </select>
     <select id="isReConfirm" resultType="java.lang.Integer">
         select pilot_status
@@ -1977,12 +1982,12 @@
         limit #{pageNo}, #{pageSize}
     </select>
     <select id="reSendOrder" resultType="java.lang.Integer">
-        select count(*) from requirements_service_temp where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
+        select count(*) from requirements_service_temp where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId} and is_deleted=0
     </select>
     <select id="isTeamSendOrder" resultType="java.lang.Integer">
         select count(*)
         from requirements_service_temp
-        where requirements_info_id = #{requireId} and team_user_id is not null;
+        where requirements_info_id = #{requireId} and team_user_id is not null and is_deleted=0;
     </select>
     <select id="mySendPublish" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT
@@ -2025,7 +2030,7 @@
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
         LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
-        WHERE rs.team_user_id = #{userAccountId} and ri.is_deleted!=1
+        WHERE rs.team_user_id = #{userAccountId} and ri.is_deleted!=1 and rs.is_deleted=0
         and father_require_id = 0
         and rs.pilot_certification_user_id is null
         <if test=" requirementsInfoId != null  ">
@@ -2047,7 +2052,7 @@
         LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
         LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
-        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1 and rs.is_deleted=0
         and father_require_id = 0
         and rs.pilot_certification_user_id is null
         <if test=" requirementsInfoId != null  ">
@@ -2132,7 +2137,7 @@
                  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}
+        WHERE ri.id = #{id} and rs.is_deleted=0
     </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}