飞手团队管理员确认拒绝派单

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -197,4 +197,7 @@ public class RequirementsInfoVO implements Serializable {
 
     @ApiModelProperty(value = "后台修改后的金额")
     private BigDecimal changedOrderAmount;
+
+    @ApiModelProperty(value = "管理员操作")
+    private int teamStatus;
 }

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

@@ -177,6 +177,13 @@ public class RequirementsController extends BaseController {
         return ResultBody.success(requirementsService.myPublish(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
     }
 
+    @ApiOperation(value = "小程序——我的发布(需要派单列表)")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("mySendPublish")
+    public ResultBody<RequirementsInfoVO> mySendPublish(HttpServletRequest request, @Validated(value = {Page.class}) @ApiParam(value = "我的发单", required = true) @RequestBody MyPublishQO param) {
+        return ResultBody.success(requirementsService.mySendPublish(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
+    }
+
 
     @ApiOperation(value = "new——小程序-—服务订单--我的抢单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@@ -391,4 +398,11 @@ public class RequirementsController extends BaseController {
     public ResultBody orderConfirmationByPilot(@ApiParam(value = "派单id") @RequestParam Integer id,@ApiParam(value = "确认状态：1同意，2不同意") @RequestParam Integer status) {
         return requirementsService.orderConfirmationByPilot(id,status);
     }
+
+    @ApiOperation(value = "管理员确实（拒绝）派单")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("adminAgreeOrder")
+    public ResultBody adminAgreeOrder(@ApiParam(value = "派单id") @RequestParam Integer id,@ApiParam(value = "确认状态：1同意，2不同意") @RequestParam Integer status) {
+        return requirementsService.orderConfirmationByTeam(id,status);
+    }
 }
\ No newline at end of file

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

@@ -139,6 +139,15 @@ public interface RequirementsDao {
 
     List<RequirementsInfoDO> myPublish(MyPublishQO param);
 
+
+    int mySendPublishCount(MyPublishQO param);
+    /**
+     * 获取需要管理员（飞手团队后台账号对应的小程序用户id） 同意或者指派的订单
+     * @param param 条件
+     * @return {@link List}<{@link RequirementsInfoDO}>
+     */
+    List<RequirementsInfoDO> mySendPublish(MyPublishQO param);
+
     List<RequirementsInfoDO> myPreempt(MyPreemptQO param);
 
     RequirementsServiceDO droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId);
@@ -322,7 +331,7 @@ public interface RequirementsDao {
      * @param requirementsId 订单id
      * @return {@link Integer}
      */
-    Integer selectRequirementsNum(Integer requirementsId);
+    int selectRequirementsNum(Integer requirementsId);
 
     /**
      * 根据父订单id查询不满足状态条件的子订单数量

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

@@ -183,6 +183,8 @@ public class RequirementsInfoDO implements Serializable {
     @ApiModelProperty(value = "订单的父订单id")
     private Integer fatherRequireId;
 
+    @ApiModelProperty(value = "管理员操作")
+    private int teamStatus;
 
     public RequirementsInfoVO buildRequirementsInfoVO() {
         return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName)
@@ -221,6 +223,7 @@ public class RequirementsInfoDO implements Serializable {
                 .repertory(this.repertory)
                 .requireNum(this.requireNum)
                 .serviceFlowId(this.serviceFlowId)
+                .teamStatus(this.teamStatus)
                 .build();
 
     }

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

@@ -72,6 +72,14 @@ public interface RequirementsService {
 
     PageResult myPublish(Integer userAccountId, MyPublishQO param);
 
+    /**
+     * 需要指派或者需要同意派单的列表
+     * @param adminUserId 用户的id
+     * @param param 查询的条件
+     * @return {@link PageResult}
+     */
+    PageResult mySendPublish(Integer adminUserId, MyPublishQO param);
+
     ResultBody<RequirementsInfoVO> grabTheOrder(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request);
 
     ResultBody arriveAtTheScene(ServiceArriveSceneVO serviceArriveSceneVO);

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

@@ -2907,6 +2907,27 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     }
 
+
+    @Override
+    public PageResult mySendPublish(Integer userAccountId, MyPublishQO param) {
+        Integer pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        param.setUserAccountId(userAccountId);
+        int count = requirementsDao.myPublishcount(param);
+        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.mySendPublish(param);
+        List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
+        List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
+        for (RequirementsInfoVO requirementsInfoVO : collect) {
+            for (IndustryTypeDTO industryTypeDTO : industryTypeDTOS) {
+                if (requirementsInfoVO.getServiceId() != null && requirementsInfoVO.getServiceId().equals(industryTypeDTO.getId())) {
+                    requirementsInfoVO.setServiceName(industryTypeDTO.getTypeName());
+                }
+            }
+        }
+        return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
+
+    }
+
     @Override
     public ServiceRequirementsDO getRepertory(GrabTheOrderVO grabTheOrderVO, HttpServletRequest request) {
         return requirementsDao.grabTheOrder(grabTheOrderVO.getRequirementsInfoId());
@@ -3360,10 +3381,18 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody orderConfirmationByTeam(Integer id,Integer status) {
-        if(requirementsDao.isReConfirm(id) != 0){
-            return ResultBody.error("重复确认");
+        //查询订单所需总人数 大于1说明是一个多人订单
+        int requirementsNum = requirementsDao.selectRequirementsNum(id);
+        if(requirementsNum == 1){
+            if(requirementsDao.isReConfirm(id) != 0){
+                return ResultBody.error("重复确认");
+            }
+            requirementsDao.orderConfirmationByTeam(id, status);
+        } else if (requirementsNum > 1) {
+
         }
-        requirementsDao.orderConfirmationByTeam(id, status);
+
+
         PersonSendOrderDO personSendOrderDO = requirementsDao.selectSendOrderById(id);
         // 管理员同意接单
         if(status == 1){

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

@@ -1969,6 +1969,78 @@
         from requirements_service_temp
         where require_info_id = #{requireId} and team_user_id is not null;
     </select>
+    <select id="mySendPublish" 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,
+        ri.require_num,
+        rau.update_order_amount,
+        ri.repertory,
+        rs.pilot_certification_id,
+        rs.pilot_certification_user_id,
+        rs.team_status
+        FROM
+        requirements_service_temp rs
+        left join requirements_info ri on ri.id = rs.requirements_info_id
+        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
+        LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
+        and father_require_id = 0
+        and rs.pilot_certification_user_id is null
+        <if test=" requirementsInfoId != null  ">
+            and ri.id=#{requirementsInfoId}
+        </if>
+        <if test="requireDescription!=null and requireDescription!='' ">
+            and  ri.require_description like CONCAT("%",#{requireDescription},"%")
+        </if>
+        ORDER BY ri.id desc
+        limit #{pageNo}, #{pageSize}
+    </select>
+    <select id="mySendPublishCount" resultType="java.lang.Integer">
+        SELECT
+        count(rs.id)
+        FROM
+        requirements_service_temp rs
+        left join requirements_info ri on ri.id = rs.requirements_info_id
+        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
+        LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
+        and father_require_id = 0
+        and rs.pilot_certification_user_id is null
+        <if test=" requirementsInfoId != null  ">
+            and ri.id=#{requirementsInfoId}
+        </if>
+        <if test="requireDescription!=null and requireDescription!='' ">
+            and  ri.require_description like CONCAT("%",#{requireDescription},"%")
+        </if>
+    </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>