飞手派单最后修改小问题

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/MyPublishQO.java

 package com.mmc.csf.infomation.qo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.mmc.csf.release.model.group.Freeze;
 import com.mmc.csf.release.model.group.Page;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,6 +41,8 @@ public class MyPublishQO {
     @ApiModelProperty(value = "描述",example = "hh")
     private String requireDescription;
 
+    @JsonIgnore
+    private int type;
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

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

@@ -31,6 +31,8 @@ public class RequirementsInfoVO implements Serializable {
     @NotNull(message = "id不能为空", groups = {Update.class})
     private Integer id;
 
+    private Integer tempId;
+
     @ApiModelProperty(value = "需求发布id", hidden = true)
     private Integer requirementsInfoId;
 
@@ -79,7 +81,6 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "描述图片", example = "http://,http://", required = false)
     private String requireUrl;
 
-
     @ApiModelProperty(value = "发布者姓名", example = "张三")
     // @NotNull(message = "发布者姓名不能为空", groups = {Insert.class})
     private String publishName;

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

@@ -363,13 +363,21 @@ public class RequirementsController extends BaseController {
         return requirementsService.deleteRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
-    @ApiOperation(value = "小程序—获取子订单详细信息")
+    @ApiOperation(value = "小程序—抢单——获取子订单详细信息")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("selectRequireSonInfo")
     public ResultBody<RequirementsInfoVO> selectRequireSonInfo(HttpServletRequest request, @Validated(value = {Page.class}) @ApiParam(value = "查询所有子订单信息", required = true) @RequestBody MyPublishQO param) {
+        param.setType(0);
         return ResultBody.success(requirementsService.selectRequireSonInfo(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
     }
 
+    @ApiOperation(value = "小程序——派单——获取子订单信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("selectRequireInfo")
+    public ResultBody<RequirementsInfoVO> selectRequireInfo(HttpServletRequest request, @Validated(value = {Page.class}) @ApiParam(value = "查询所有子订单信息", required = true) @RequestBody MyPublishQO param) {
+        param.setType(1);
+        return ResultBody.success(requirementsService.selectRequireSonInfo(this.getUserLoginInfoFromRedis(request).getUserAccountId(), param));
+    }
     @ApiOperation(value = "小程序—发单方(同意/拒绝)该飞手")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("agreeOrRefusePilot")
@@ -404,17 +412,17 @@ public class RequirementsController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("orderConfirmationByPilot")
     public ResultBody orderConfirmationByPilot(HttpServletRequest request,
-            @ApiParam(value = "派单id") @RequestParam Integer id,
+            @ApiParam(value = "派单id") @RequestParam Integer tempId,
             @ApiParam(value = "确认状态：1同意，2不同意") @RequestParam Integer status) {
-        return requirementsService.orderConfirmationByPilot(id,status,this.getUserLoginInfoFromRedis(request).getToken());
+        return requirementsService.orderConfirmationByPilot(tempId,status,this.getUserLoginInfoFromRedis(request).getToken());
     }
 
-    @ApiOperation(value = "管理员确实（拒绝）派单")
+    @ApiOperation(value = "管理员确认（拒绝）派单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("adminAgreeOrder")
     public ResultBody adminAgreeOrder(HttpServletRequest request,
-            @ApiParam(value = "派单id") @RequestParam Integer id,
+            @ApiParam(value = "派单id") @RequestParam Integer requireId,
             @ApiParam(value = "确认状态：1同意，2不同意") @RequestParam Integer status) {
-        return requirementsService.orderConfirmationByTeam(id,status,this.getUserLoginInfoFromRedis(request).getToken());
+        return requirementsService.orderConfirmationByTeam(requireId,status,this.getUserLoginInfoFromRedis(request).getToken());
     }
 }
\ No newline at end of file

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

@@ -366,6 +366,14 @@ public interface RequirementsDao {
 
     RequirementsServicePilotInfoDO selectPilotInfoByRequireId(Integer requireId);
 
+
+    /**
+     * 获取临时表对应的订单信息
+     * @param requireId
+     * @return {@link RequirementsServicePilotInfoDO}
+     */
+    RequirementsServicePilotInfoDO selectTempPilotInfoByRequireId(Integer requireId);
+
     /**
      * 根据流程id查询订单所处状态
      * @param serviceFlowId
@@ -451,6 +459,7 @@ public interface RequirementsDao {
      */
     Integer isReConfirm(Integer id);
 
+    void updateSendOrder(PersonSendOrderDO personSendOrderDO);
 
     /**
      * 管理员确认接单
@@ -477,4 +486,11 @@ public interface RequirementsDao {
      */
     Integer selectSenderId(Integer id);
 
+
+    /**
+     * 修改
+     * @param requireId
+     * @param num
+     */
+    void updateOrderRequireNum(Integer requireId,int num);
 }

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

@@ -28,6 +28,9 @@ import java.util.Date;
 public class RequirementsInfoDO implements Serializable {
     private static final long serialVersionUID = -1811974173256250060L;
     private Integer id;
+
+    private Integer tempId;
+
     private Integer requirementTypeId;
     private Integer userAccountId;
     private Integer provinceCode;
@@ -224,6 +227,7 @@ public class RequirementsInfoDO implements Serializable {
                 .requireNum(this.requireNum)
                 .serviceFlowId(this.serviceFlowId)
                 .teamStatus(this.teamStatus)
+                .tempId(this.tempId)
                 .build();
 
     }

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

@@ -143,6 +143,7 @@ public interface RequirementsService {
      */
     PageResult selectRequireSonInfo(Integer userAccountId, MyPublishQO param);
 
+
     /**
      * 同意或者拒绝飞手接单
      * @param param 参数

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

@@ -3264,11 +3264,19 @@ public class RequirementsServiceImpl implements RequirementsService {
         int count = requirementsDao.myPublishcount(param);
         List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.selectRequireSonInfo(param);
 
+
         for(RequirementsInfoDO requirementsInfoDO : requirementsInfoDOS) {
-            if (requirementsInfoDO.getServiceFlowId() != 1 && requirementsInfoDO.getServiceFlowId() != 7) {
-                RequirementsServicePilotInfoDO pilotInfo = requirementsDao.selectPilotInfoByRequireId(requirementsInfoDO.getId());
-                requirementsInfoDO.setPilotCertificationId(pilotInfo.getPilotCertificationId());
-                requirementsInfoDO.setPilotCertificationUserId(pilotInfo.getPilotCertificationUserId());
+            if (requirementsInfoDO.getServiceFlowId() != 1 && requirementsInfoDO.getServiceFlowId() != 7 ) {
+                RequirementsServicePilotInfoDO pilotInfo = null;
+                if (param.getType() == 0) {
+                    pilotInfo = requirementsDao.selectPilotInfoByRequireId(requirementsInfoDO.getId());
+                }else {
+                    pilotInfo = requirementsDao.selectTempPilotInfoByRequireId(requirementsInfoDO.getId());
+                }
+                if(pilotInfo != null) {
+                    requirementsInfoDO.setPilotCertificationId(pilotInfo.getPilotCertificationId());
+                    requirementsInfoDO.setPilotCertificationUserId(pilotInfo.getPilotCertificationUserId());
+                }
             }
         }
 
@@ -3284,6 +3292,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
     }
 
+
     @Override
     public ResultBody agreeOrRefusePilot(AgreeOrRefusePilotQO param) {
         //判断飞手是否被同意 2就是该抵达现场下一步流程
@@ -3309,9 +3318,9 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody personSendOrder(PersonSendOrderVO personSendOrderVO,String token) {
-        if(requirementsDao.isReSendOrder(personSendOrderVO.getRequirementsInfoId() )!= 0){
-            return ResultBody.error("重复派单");
-        }
+//        if(requirementsDao.isReSendOrder(personSendOrderVO.getRequirementsInfoId() )!= 0){
+//            return ResultBody.error("重复派单");
+//        }
         if(requirementsDao.reSendOrder(personSendOrderVO.getRequirementsInfoId(),personSendOrderVO.getPilotCertificationUserId()) == 1){
             return ResultBody.error("飞手拒绝过该订单或者已经派单，不能重复派单");
         }
@@ -3320,8 +3329,9 @@ public class RequirementsServiceImpl implements RequirementsService {
         // 1、是否是团队派单
         if(requirementsDao.isTeamSendOrder(personSendOrderVO.getRequirementsInfoId()) != 0){
             personSendOrderDO = new PersonSendOrderDO(personSendOrderVO);
-            requirementsDao.personSendOrder(personSendOrderDO);
+            requirementsDao.updateSendOrder(personSendOrderDO);
             SmsUtil.sendPilotOrder(pilotPhone);
+            requirementsDao.updateOrderRequireNum(personSendOrderVO.getRequirementsInfoId(),0);
             return ResultBody.success("派单成功，等待飞手确认");
         }
 
@@ -3337,12 +3347,14 @@ public class RequirementsServiceImpl implements RequirementsService {
             // TODO 定时器、发送短信、公众号通知
             String managerPhone = userAppApi.getPilotApplyPhone(token, managerId);
             SmsUtil.sendPilotOrder(managerPhone);
+            requirementsDao.updateOrderRequireNum(personSendOrderVO.getRequirementsInfoId(),0);
             return ResultBody.success("派单飞手拥有团队，等待团队管理员确认后重新给您分配飞手");
         }else{
             personSendOrderDO = new PersonSendOrderDO(personSendOrderVO);
             requirementsDao.personSendOrder(personSendOrderDO);
             // TODO 定时器 发送短信、公众号通知
             SmsUtil.sendPilotOrder(pilotPhone);
+            requirementsDao.updateOrderRequireNum(personSendOrderVO.getRequirementsInfoId(),0);
             return ResultBody.success("派单成功，等待飞手确认");
         }
     }
@@ -3351,6 +3363,7 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody teamSendOrder(Integer fatherRequireId, Integer managerId,String token) {
         // 查询所有的子订单id
         List<Integer> ids = requirementsDao.selectAllSuborder(fatherRequireId);
+        requirementsDao.updateInfoStatus(fatherRequireId,13);
         PersonSendOrderDO personSendOrderDO = null;
         for (Integer id : ids) {
             personSendOrderDO = new PersonSendOrderDO();
@@ -3359,17 +3372,21 @@ public class RequirementsServiceImpl implements RequirementsService {
             requirementsDao.personSendOrder(personSendOrderDO);
             // 修改info表中的状态为13派单中
             requirementsDao.updateInfoStatus(id,13);
+
+            //修改子订单所需人数
+            requirementsDao.updateOrderRequireNum(id,0);
         }
         String managerPhone = userAppApi.getPilotApplyPhone(token, managerId);
         SmsUtil.sendPilotOrder(managerPhone);
+        requirementsDao.updateOrderRequireNum(fatherRequireId,0);
         return ResultBody.success("等待团队管理员确认");
     }
 
     @Override
     public ResultBody orderConfirmationByPilot(Integer id,Integer status,String token) {
-        if(requirementsDao.isReConfirm(id) != 0){
-            return ResultBody.error("重复确认");
-        }
+//        if(requirementsDao.isReConfirm(id) != 0){
+//            return ResultBody.error("重复确认");
+//        }
         requirementsDao.orderConfirmationByPilot(id, status);
         PersonSendOrderDO personSendOrderDO = requirementsDao.selectSendOrderById(id);
         // 飞手同意接单
@@ -3378,7 +3395,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             // 同步派单信息到抢单表中
             requirementsDao.insertService(requirementsServiceDO);
 //            SmsUtil.sendPassPilotApply(phone);
-            // TODO 发送短信、公众号通知
+            // TODO 公众号通知
             // 修改info表中的状态为2等待抵达任务地点
             requirementsDao.updateInfoStatus(personSendOrderDO.getRequirementsInfoId(),2);
             Integer userId = requirementsDao.selectSenderId(personSendOrderDO.getRequirementsInfoId());
@@ -3391,25 +3408,27 @@ public class RequirementsServiceImpl implements RequirementsService {
             orderDO.setRequirementsInfoId(personSendOrderDO.getRequirementsInfoId());
             orderDO.setTeamUserId(personSendOrderDO.getTeamUserId());
             requirementsDao.personSendOrder(orderDO);
-            // TODO 发送短信、公众号通知
+            // TODO 公众号通知
             String managerPhone = userAppApi.getPilotApplyPhone(token, personSendOrderDO.getTeamUserId());
             SmsUtil.sendRefuseManager(managerPhone);
             return ResultBody.success("飞手拒绝派单，需要管理员继续派单");
         }
         // 订单发往抢单大厅
         requirementsDao.updateCount(personSendOrderDO.getRequirementsInfoId());
-        // TODO 发送短信、公众号通知
+        // TODO 公众号通知
         // 修改info表中的状态为1等待抢单
         requirementsDao.updateInfoStatus(personSendOrderDO.getRequirementsInfoId(),1);
         Integer userId = requirementsDao.selectSenderId(personSendOrderDO.getRequirementsInfoId());
         String userPhone = userAppApi.getPilotApplyPhone(token, userId);
         SmsUtil.sendRefuseUser(userPhone);
+        requirementsDao.updateOrderRequireNum(personSendOrderDO.getRequirementsInfoId(),0);
         return ResultBody.success("飞手已拒绝接单,订单发往抢单大厅");
     }
 
     @Override
     public ResultBody orderConfirmationByTeam(Integer id,Integer status,String token) {
         //查询订单所需总人数 大于1说明是一个多人订单
+        requirementsDao.orderConfirmationByTeam(id, status);
         int requirementsNum = requirementsDao.selectRequirementsNum(id);
         if(requirementsNum == 1){
             if(requirementsDao.isReConfirm(id) != 0){
@@ -3423,6 +3442,9 @@ public class RequirementsServiceImpl implements RequirementsService {
             //每一个子订单都要同意下
             for (Integer i : ids) {
                 requirementsDao.orderConfirmationByTeam(i, status);
+                if(status == 2) {
+                    requirementsDao.updateOrderRequireNum(i,1);
+                }
             }
         }
         // 管理员同意接单
@@ -3433,6 +3455,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         Integer userId = requirementsDao.selectSenderId(id);
         String userPhone = userAppApi.getPilotApplyPhone(token, userId);
         SmsUtil.sendManagerRefuseOrder(userPhone);
+        requirementsDao.updateOrderRequireNum(id,requirementsNum);
         // TODO 发送短信、公众号通知
         return ResultBody.success("团队管理员已拒绝接单,订单发往抢单大厅");
     }

release-service/src/main/java/com/mmc/csf/release/util/SmsUtil.java

@@ -14,7 +14,7 @@ public class SmsUtil {
     public static String ALIYUN_OSS_ACCESS_KEY_ID = "LTAI5tS3GNPRZAkG9LCQBZmc";
     public static String ALIYUN_OSS_ACCESS_KEY_SECRET = "ZkPrv1u2mN2DmOIc7GfPKRuy4Risqe";
 
-    public static String CLOUD_JOIN_WEBSITE = "云享飞Pro";
+    public static String CLOUD_JOIN_WEBSITE = "云享飞";
 
     private static String ENDPOINT = "dysmsapi.aliyuncs.com";
     /**

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

@@ -599,7 +599,11 @@
                                          wechat_pay_order_number, service_flow_id, preempt_total_amount, openid,
                                          create_time, update_time, preempt_phone)
         VALUES (#{requirementsInfoId}, #{pilotCertificationId}, #{pilotCertificationUserId},
-                #{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber},10,
+                #{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber},
+            CASE #{serviceFlowId}
+                when null then 10
+                else #{serviceFlowId} end
+                ,
                 #{preemptTotalAmount}, #{openid}, NOW(), NOW(), #{phoneNum});
     </insert>
 
@@ -1622,7 +1626,7 @@
         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
 #         left join requirements_service rs on ri.id = rs.requirements_info_id
-        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1
+        WHERE ri.is_deleted!=1
         <if test=" requirementsInfoId != null  ">
             and ri.father_require_id=#{requirementsInfoId}
         </if>
@@ -1663,7 +1667,7 @@
     <update id="orderConfirmationByTeam">
         update requirements_service_temp
         set team_status = #{status}
-        where id = #{id}
+        where requirements_info_id = #{id}
     </update>
 
     <update id="updateCount">
@@ -1676,6 +1680,17 @@
         set service_flow_id = #{status}
         where id = #{id}
     </update>
+    <update id="updateSendOrder">
+        update requirements_service_temp
+        set pilot_certification_id = #{pilotCertificationId},
+            pilot_certification_user_id = #{pilotCertificationUserId}
+        where requirements_info_id = #{requirementsInfoId}
+    </update>
+    <update id="updateOrderRequireNum">
+        update requirements_info
+        set repertory = num
+        where id = #{requireId}
+    </update>
 
     <insert id="insertAgreePilotOrder">
         insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
@@ -1921,8 +1936,8 @@
 
     <select id="mySendOderList" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT
-        rs.id,
-        rs.requirements_info_id,
+        ri.id,
+        rs.id as tempId,
         ri.task_title,
         ri.task_start_time,
         ri.task_end_time,
@@ -1972,6 +1987,7 @@
     <select id="mySendPublish" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
         SELECT
         ri.id,
+        rs.id as requireTempId,
         ri.task_title,
         ri.task_start_time,
         ri.task_end_time,
@@ -2009,7 +2025,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 rs.team_user_id = #{userAccountId} and ri.is_deleted!=1
         and father_require_id = 0
         and rs.pilot_certification_user_id is null
         <if test=" requirementsInfoId != null  ">
@@ -2051,6 +2067,15 @@
         from requirements_info
         where id = #{id}
     </select>
+    <select id="selectTempPilotInfoByRequireId"
+            resultType="com.mmc.csf.release.entity.requirements.RequirementsServicePilotInfoDO">
+        select pilot_certification_id,pilot_certification_user_id
+        from requirements_service_temp
+        where is_deleted != 1
+          and requirements_info_id = #{requireId}
+
+
+    </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>