Requirements(update)

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -128,6 +128,21 @@ public class RequirementsController extends BaseController {
         return requirementsService.deletePublish(id, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
+    @ApiOperation(value = "new——发布者删除服务需求")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("deletePublishService")
+    public ResultBody deletePublishService(@RequestParam Integer requirementsInfoId, HttpServletRequest request) {
+        return requirementsService.deletePublishService(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
+    @ApiOperation(value = "new——抢单者删除服务需求")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("deletePreempt")
+    public ResultBody deletePreempt(@RequestParam Integer requirementsInfoId, HttpServletRequest request) {
+        return requirementsService.deletePreempt(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
+
     @ApiOperation(value = "小程序-列表——需求发布")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("appPublishList")

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

@@ -153,4 +153,11 @@ public interface RequirementsDao {
     RequirementsInfoDO selectSettleAccounts(ServiceSettleAccountsVO settleAccountsVO);
 
     RequirementsServiceDO serviceSettleAccounts(ServiceSettleAccountsVO settleAccountsVO);
+
+    void deletePublishService(Integer requirementsInfoId);
+
+    Integer selectDeletePreempt(Integer requirementsInfoId, Integer userAccountId);
+
+
+    void deletePreempt(Integer requirementsInfoId);
 }

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -117,4 +117,8 @@ public interface RequirementsService {
     ResultBody updateServicePublish(ServiceRequirementsEditVO requirementsInfoVO, HttpServletRequest request);
 
     ResultBody<FlowDictionaryAndTimeDTO> flowDictionaryAndTime(Integer requirementsInfoId);
+
+    ResultBody deletePublishService(Integer requirementsInfoId, Integer userAccountId);
+
+    ResultBody deletePreempt(Integer requirementsInfoId, Integer userAccountId);
 }

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

@@ -1258,6 +1258,26 @@ public class RequirementsServiceImpl implements RequirementsService {
         return ResultBody.success(flowDictionaryAndTimeDTO);
     }
 
+    @Override
+    public ResultBody deletePublishService(Integer requirementsInfoId, Integer userAccountId) {
+        Integer publish = requirementsDao.findPublishCount(requirementsInfoId, userAccountId);
+        if (publish == 0) {
+            return ResultBody.error(ResultEnum.YOU_CANNOT_DELETE_REQUIREMENTS_POSTED_BY_OTHERS);
+        }
+        requirementsDao.deletePublishService(requirementsInfoId);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody deletePreempt(Integer requirementsInfoId, Integer userAccountId) {
+        Integer publish = requirementsDao.selectDeletePreempt(requirementsInfoId, userAccountId);
+        if (publish == 0) {
+            return ResultBody.error(ResultEnum.YOU_CANNOT_DELETE_REQUIREMENTS_POSTED_BY_OTHERS);
+        }
+        requirementsDao.deletePreempt(requirementsInfoId);
+        return ResultBody.success();
+    }
+
 
     @Override
     public ResultBody publishService(ServiceRequirementsVO serviceRequirementsVO, HttpServletRequest request) {

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

@@ -554,7 +554,7 @@
         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}
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
@@ -607,7 +607,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
         INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
-        WHERE rs.pilot_certification_user_id = #{userAccountId}
+        WHERE rs.pilot_certification_user_id = #{userAccountId} AND rs.is_deleted !=1
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
@@ -971,4 +971,22 @@
                  LEFT JOIN requirements_service rs ON ri.id = rs.requirements_info_id
         WHERE ri.id = #{requirementsInfoId}
     </select>
+
+    <update id="deletePublishService">
+        update requirements_info
+        set is_deleted=1
+        where id = #{requirementsInfoId}
+    </update>
+
+    <select id="selectDeletePreempt" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM requirements_service
+        WHERE requirements_info_id = #{requirementsInfoId}
+          AND pilot_certification_user_id = #{userAccountId}
+    </select>
+    <update id="deletePreempt">
+        update requirements_service
+        set is_deleted=1
+        where requirements_info_id = #{requirementsInfoId}
+    </update>
 </mapper>