新增飞手派单接口

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/TeamMessageDTO.java

+package com.mmc.csf.infomation.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author han
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class TeamMessageDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 飞手ID
+     */
+    private Integer pilotId;
+    /**
+     * 飞手的用户ID
+     */
+    private Integer pilotUserId;
+    /**
+     * 飞手的团队管理员ID
+     */
+    private Integer pilotMessageId;
+}

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

+package com.mmc.csf.infomation.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author han
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PersonSendOrderVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "服务需求订单id")
+    @NotNull(message = "id不能为空")
+    private Integer requirementsInfoId;
+
+    @ApiModelProperty(value = "派单飞手id")
+    private Integer pilotCertificationId;
+
+    @ApiModelProperty(value = "派单飞手用户id")
+    private Integer pilotCertificationUserId;
+}

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

@@ -369,4 +369,12 @@ public class RequirementsController extends BaseController {
     public ResultBody agreeOrRefusePilot(@Validated @RequestBody AgreeOrRefusePilotQO param) {
         return requirementsService.agreeOrRefusePilot(param);
     }
+
+    @ApiOperation(value = "飞手派单")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @NotRepeatSubmit(value = 3000L)
+    @PostMapping("personSendOrder")
+    public ResultBody personSendOrder(@RequestBody PersonSendOrderVO personSendOrderVO) {
+        return requirementsService.personSendOrder(personSendOrderVO);
+    }
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.*;
 import com.mmc.csf.infomation.vo.LiabilityProblemVO;
 import com.mmc.csf.infomation.vo.ServiceSettleAccountsVO;
+import com.mmc.csf.release.entity.information.PersonSendOrderDO;
 import com.mmc.csf.release.entity.requirements.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -401,4 +402,10 @@ public interface RequirementsDao {
      * @return {@link Integer}
      */
     Integer getPilotUserIdByRequireId(Integer requireId);
+
+    /**
+     * 根据飞手进行派单操作
+     */
+    Integer personSendOrder(PersonSendOrderDO personSendOrderDO);
+
 }

release-service/src/main/java/com/mmc/csf/release/entity/information/PersonSendOrderDO.java

+package com.mmc.csf.release.entity.information;
+
+import com.mmc.csf.infomation.vo.IndustryCaseVO;
+import com.mmc.csf.infomation.vo.PersonSendOrderVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author han
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PersonSendOrderDO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private  Integer id;
+    /**
+     * 服务需求订单id
+     */
+    private Integer requirementsInfoId;
+    /**
+     * 派单飞手id
+     */
+    private Integer pilotCertificationId;
+    /**
+     * 派单飞手用户id
+     */
+    private Integer pilotCertificationUserId;
+    /**
+     * 派单飞手用户id
+     */
+    private Integer teamId;
+    /**
+     * 派单飞手用户id
+     */
+    private Integer teamUserId;
+
+    public PersonSendOrderDO(PersonSendOrderVO personSendOrderVO){
+        this.requirementsInfoId = personSendOrderVO.getRequirementsInfoId();
+        this.pilotCertificationId = personSendOrderVO.getPilotCertificationId();
+        this.pilotCertificationUserId = personSendOrderVO.getPilotCertificationUserId();
+    }
+}

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

@@ -3,6 +3,7 @@ package com.mmc.csf.release.feign;
 
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.PilotCertificationInteriorDTO;
+import com.mmc.csf.infomation.dto.TeamMessageDTO;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.infomation.dto.UserBaseInfoDTO;
 import com.mmc.csf.release.auth.qo.BUserAccountQO;
@@ -93,4 +94,7 @@ public interface UserAppApi {
 
     @PostMapping("/userapp/wx/send")
     ResultBody feignSendWxMsg(@RequestHeader("token") String token,@RequestBody WxMsgVO ws);
+
+    @GetMapping("/userapp/pilot/selectPilotTeam")
+    TeamMessageDTO selectPilotTeam(@RequestParam Integer pilotId);
 }

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/UserAppApiHystrix.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.infomation.dto.PilotCertificationInteriorDTO;
+import com.mmc.csf.infomation.dto.TeamMessageDTO;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.infomation.dto.UserBaseInfoDTO;
 import com.mmc.csf.release.auth.qo.BUserAccountQO;
@@ -13,6 +14,7 @@ import com.mmc.csf.release.flyer.vo.CurriculumOrderLogVO;
 import com.mmc.csf.user.vo.ChangeUserPointVO;
 import com.mmc.csf.user.vo.WxMsgVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -89,5 +91,10 @@ public class UserAppApiHystrix implements UserAppApi {
         return null;
     }
 
+    @Override
+    public TeamMessageDTO selectPilotTeam(Integer pilotId) {
+        return null;
+    }
+
 
 }

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

@@ -5,6 +5,7 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.*;
 import com.mmc.csf.infomation.vo.*;
+import com.mmc.csf.release.entity.information.PersonSendOrderDO;
 import com.mmc.csf.release.entity.requirements.ServiceRequirementsDO;
 
 import javax.servlet.http.HttpServletRequest;
@@ -140,4 +141,9 @@ public interface RequirementsService {
      * @return {@link ResultBody}
      */
     ResultBody agreeOrRefusePilot(AgreeOrRefusePilotQO param);
+
+    /**
+     * 根据飞手进行派单操作
+     */
+    ResultBody personSendOrder(PersonSendOrderVO personSendOrderVO);
 }

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

@@ -15,6 +15,7 @@ import com.mmc.csf.release.constant.*;
 import com.mmc.csf.release.controller.countDown.RedisUtil;
 import com.mmc.csf.release.dao.OrderAmountDetailDao;
 import com.mmc.csf.release.dao.RequirementsDao;
+import com.mmc.csf.release.entity.information.PersonSendOrderDO;
 import com.mmc.csf.release.entity.requirements.*;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.feign.UserAppApi;
@@ -33,6 +34,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
@@ -3280,6 +3282,23 @@ public class RequirementsServiceImpl implements RequirementsService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody personSendOrder(PersonSendOrderVO personSendOrderVO) {
+        TeamMessageDTO teamMessageDTO = userAppApi.selectPilotTeam(personSendOrderVO.getPilotCertificationId());
+        PersonSendOrderDO personSendOrderDO = null;
+        if(teamMessageDTO != null){
+            personSendOrderDO = new PersonSendOrderDO();
+            personSendOrderDO.setRequirementsInfoId(personSendOrderVO.getRequirementsInfoId());
+            personSendOrderDO.setTeamUserId(teamMessageDTO.getPilotMessageId());
+        }else{
+            personSendOrderDO = new PersonSendOrderDO(personSendOrderVO);
+        }
+        Integer id = requirementsDao.personSendOrder(personSendOrderDO);
+
+        // TODO 定时器
+        return ResultBody.success();
+    }
+
     public UserAccountSimpleDTO feignGetUserSimpleInfo(Integer userAccountId, HttpServletRequest request) {
         String token = request.getHeader("token");
         HttpHeaders headers = new HttpHeaders();

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

@@ -1660,6 +1660,23 @@
         insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
         values(#{requireInfoId},#{serviceFlowId},#{pilotCertificationUserId},NOW())
     </insert>
+    <insert id="personSendOrder" useGeneratedKeys="true" keyProperty="id">
+        insert into requirements_service_temp
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="requirementsInfoId != null">requirements_info_id,</if>
+            <if test="pilotCertificationId != null">pilot_certification_id,</if>
+            <if test="pilotCertificationUserId != null">pilot_certification_user_id,</if>
+            <if test="teamId != null">team_id,</if>
+            <if test="teamUserId != null">team_user_id</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="requirementsInfoId != null">#{requirementsInfoId,jdbcType=INTEGER},</if>
+            <if test="pilotCertificationId != null">#{pilotCertificationId,jdbcType=INTEGER},</if>
+            <if test="pilotCertificationUserId != null">#{pilotCertificationUserId,jdbcType=INTEGER},</if>
+            <if test="teamId != null">#{teamId,jdbcType=INTEGER},</if>
+            <if test="teamUserId != null">#{teamUserId,jdbcType=INTEGER}</if>
+        </trim>
+    </insert>
 
     <select id="selectServiceIdByRequireIdAndUserId" resultType="java.lang.Integer">
         select service_flow_id from agree_pilot_order