修改bug

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

@@ -158,6 +158,13 @@ public interface RequirementsDao {
 
     RequirementsInfoDO publisherCancel(Integer requirementsInfoId, Integer userAccountId);
 
+    /**
+     * 取消订单
+     * @param requirementsInfoId
+     * @param userAccountId
+     * @return {@link RequirementsInfoDO}
+     */
+    RequirementsInfoDO publisherCancel1(Integer requirementsInfoId, Integer userAccountId);
     RequirementsInfoDO publisherCancelFlyers(Integer requirementsInfoId);
 
     RequirementsInfoDO customerPublisherCancel(Integer requirementsInfoId, Integer userAccountId);
@@ -506,4 +513,12 @@ public interface RequirementsDao {
      * @param num
      */
     void updateOrderRequireNum(Integer requireId,int num);
+
+
+    /**
+     * 在requirements_service表中查找这个订单是否有人接单
+     * @param requirementsInfoId 订单id
+     * @return int
+     */
+    int countRequireServiceNum(Integer requirementsInfoId);
 }

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

@@ -1064,7 +1064,7 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody publisherCancel(Integer requirementsInfoId, Integer userAccountId, HttpServletRequest request) {
-        RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(requirementsInfoId, userAccountId);
+        RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel1(requirementsInfoId, userAccountId);
         RequirementsServiceDO serviceDO = requirementsDao.serviceReq(requirementsInfoId);
         if (serviceDO != null) {
             IsNullConvertZeroUtil.checkIsNull(serviceDO);

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

@@ -2146,6 +2146,56 @@
             AND ra.user_account_id = ri.user_account_id
         WHERE ri.id = #{id} and(rs.requirements_info_id is null or rs.is_deleted=0)
     </select>
+    <select id="countRequireServiceNum" resultType="java.lang.Integer">
+        select count(*) from requirements_service where
+        requirements_info_id = #{requireId} and service_flow_id != 11
+    </select>
+    <select id="publisherCancel1" 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,
+               ra.total_amount,
+               ri.insurance,
+               ra.order_level,
+               ra.order_amount,
+               sf.doing,
+               sf.waiting,
+               sf.user_port,
+               sf.flyer_port,
+               sf.order_status,
+               ri.publish,
+               ra.order_amount,
+               ra.we_chat,
+               ra.salary_amount,
+               ra.cash_amount,
+               ra.level_cash_amount,
+               ra.level_salary_amount,
+               ra.level_we_chat_amount,
+               ra.wechat_pay_order_number,
+               ri.service_flow_id,
+               ri.create_time,
+               ra.order_level_amount,
+               ra.order_earnings
+        FROM requirements_info ri
+                 LEFT JOIN requirements_type rt
+                           ON rt.id = ri.requirement_type_id
+                 LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
+                 LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+        WHERE ri.user_account_id = #{userAccountId}
+            AND ri.id = #{requirementsInfoId}
+    </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>