Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
ims
Commits
5f5091b1
提交
5f5091b1
authored
11月 08, 2023
作者:
恶龙咆哮
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
飞手状态变化 以及 需求方同意拒绝飞手
上级
da8a4a58
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
132 行增加
和
2 行删除
+132
-2
AgreeOrRefusePilotQO.java
.../java/com/mmc/csf/infomation/qo/AgreeOrRefusePilotQO.java
+24
-0
RequirementsInfoVO.java
...in/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
+2
-0
RequirementsController.java
...om/mmc/csf/release/controller/RequirementsController.java
+9
-0
RequirementsDao.java
...rc/main/java/com/mmc/csf/release/dao/RequirementsDao.java
+35
-0
RequirementsInfoDO.java
...c/csf/release/entity/requirements/RequirementsInfoDO.java
+3
-0
RequirementsService.java
...java/com/mmc/csf/release/service/RequirementsService.java
+8
-0
RequirementsServiceImpl.java
...mmc/csf/release/service/impl/RequirementsServiceImpl.java
+25
-0
RequirementsDao.xml
...rc/main/resources/mapper/requirements/RequirementsDao.xml
+26
-2
没有找到文件。
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/AgreeOrRefusePilotQO.java
0 → 100644
浏览文件 @
5f5091b1
package
com
.
mmc
.
csf
.
infomation
.
qo
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* @author 张培
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
AgreeOrRefusePilotQO
{
@ApiModelProperty
(
value
=
"订单id"
)
private
Integer
requireInfoId
;
@ApiModelProperty
(
value
=
"同意传2 进入飞手到达现场 拒绝传 11"
)
private
Integer
serviceFlowId
;
@ApiModelProperty
(
value
=
"接单飞手的user_id"
)
private
Integer
pilotCertificationUserId
;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
浏览文件 @
5f5091b1
...
...
@@ -64,6 +64,8 @@ public class RequirementsInfoVO implements Serializable {
@ApiModelProperty
(
value
=
"任务纬度"
,
example
=
"44.344324"
)
private
Double
latitude
;
@ApiModelProperty
(
value
=
"订单的父订单id"
)
private
Integer
fatherRequireId
;
@ApiModelProperty
(
value
=
"需求描述"
,
example
=
"描述一下"
,
required
=
true
)
@NotNull
(
message
=
"需求描述不能为空"
,
groups
=
{
Insert
.
class
})
...
...
release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java
浏览文件 @
5f5091b1
...
...
@@ -2,6 +2,7 @@ package com.mmc.csf.release.controller;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.infomation.dto.*
;
import
com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO
;
import
com.mmc.csf.infomation.qo.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
...
@@ -366,4 +367,12 @@ public class RequirementsController extends BaseController {
return
ResultBody
.
success
(
requirementsService
.
selectRequireSonInfo
(
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
(),
param
));
}
@ApiOperation
(
value
=
"小程序—发单方(同意/拒绝)该飞手"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"agreeOrRefusePilot"
)
public
ResultBody
agreeOrRefusePilot
(
@RequestBody
AgreeOrRefusePilotQO
param
)
{
return
requirementsService
.
agreeOrRefusePilot
(
param
);
}
}
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
浏览文件 @
5f5091b1
...
...
@@ -2,6 +2,7 @@ package com.mmc.csf.release.dao;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.infomation.dto.*
;
import
com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO
;
import
com.mmc.csf.infomation.qo.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
...
@@ -252,4 +253,38 @@ public interface RequirementsDao {
* @return {@link List}<{@link RequirementsInfoDO}>
*/
List
<
RequirementsInfoDO
>
selectRequireSonInfo
(
MyPublishQO
param
);
/**
* 保存飞手被同意或拒绝接单信息
* @param param 是否同意飞手信息
*/
void
insertAgreePilotOrder
(
AgreeOrRefusePilotQO
param
);
/**
* 根据订单id修改所需人数以及该订单的状态
* @param requireInfoId 订单id
*/
void
updateRequirementsInfoByRefusePilot
(
Integer
requireInfoId
);
/**
* 根据订单查找父订单id
* @param requireInfoId 订单id
* @return {@link Integer}
*/
Integer
selectFatherRequireIdBySonId
(
Integer
requireInfoId
);
/**
* 根据订单id查找该订单还需人数
* @param requireInfoId 订单id
* @return {@link Integer}
*/
Integer
selectRepertoryByRequireId
(
Integer
requireInfoId
);
/**
* 根据订单id和飞手用户id删除接单的信息
* @param requireInfoId 订单id
* @param pilotUserId 飞手id
* @return {@link Integer}
*/
Integer
updateRequirementsService
(
Integer
requireInfoId
,
Integer
pilotUserId
);
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java
浏览文件 @
5f5091b1
...
...
@@ -180,6 +180,8 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty
(
value
=
"发布者openid"
)
private
String
openid
;
@ApiModelProperty
(
value
=
"订单的父订单id"
)
private
Integer
fatherRequireId
;
public
RequirementsInfoVO
buildRequirementsInfoVO
()
{
...
...
@@ -194,6 +196,7 @@ public class RequirementsInfoDO implements Serializable {
.
requireUrl
(
this
.
requireUrl
)
.
orderLevelEnum
(
this
.
orderLevel
)
.
serviceId
(
this
.
serviceId
)
.
fatherRequireId
(
this
.
fatherRequireId
)
.
serviceName
(
this
.
serviceName
)
.
totalAmount
(
this
.
totalAmount
)
.
insurance
(
this
.
insurance
)
...
...
release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java
浏览文件 @
5f5091b1
...
...
@@ -3,6 +3,7 @@ package com.mmc.csf.release.service;
import
com.mmc.csf.common.util.page.PageResult
;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.infomation.dto.*
;
import
com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO
;
import
com.mmc.csf.infomation.qo.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
...
@@ -135,4 +136,11 @@ public interface RequirementsService {
* @return {@link PageResult}
*/
PageResult
selectRequireSonInfo
(
Integer
userAccountId
,
MyPublishQO
param
);
/**
* 同意或者拒绝飞手接单
* @param param 参数
* @return {@link ResultBody}
*/
ResultBody
agreeOrRefusePilot
(
AgreeOrRefusePilotQO
param
);
}
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
浏览文件 @
5f5091b1
...
...
@@ -9,6 +9,7 @@ import com.mmc.csf.common.util.web.ResultBody;
import
com.mmc.csf.common.util.web.ResultEnum
;
import
com.mmc.csf.config.IsNullConvertZeroUtil
;
import
com.mmc.csf.infomation.dto.*
;
import
com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO
;
import
com.mmc.csf.infomation.qo.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
...
@@ -3142,6 +3143,30 @@ public class RequirementsServiceImpl implements RequirementsService {
return
PageResult
.
buildPage
(
pageNo
,
param
.
getPageSize
(),
count
,
collect
);
}
@Override
public
ResultBody
agreeOrRefusePilot
(
AgreeOrRefusePilotQO
param
)
{
//判断飞手是否被同意 2就是该抵达现场下一步流程
Boolean
agreeOrder
=
param
.
getServiceFlowId
()
==
2
;
requirementsDao
.
insertAgreePilotOrder
(
param
);
Integer
requireId
=
param
.
getRequireInfoId
();
//同意
if
(
agreeOrder
)
{
requirementsDao
.
updateScene
(
requireId
,
2
);
requirementsDao
.
updateInfo
(
requireId
,
2
);
}
else
{
//修改订单所需人数以及订单状态
requirementsDao
.
updateRequirementsInfoByRefusePilot
(
requireId
);
Integer
fatherRequireId
=
requirementsDao
.
selectFatherRequireIdBySonId
(
requireId
);
Integer
repertory
=
requirementsDao
.
selectRepertoryByRequireId
(
fatherRequireId
);
requirementsDao
.
updateRequirementsInfoRepertory
(
fatherRequireId
,
repertory
);
requirementsDao
.
updateRequirementsService
(
requireId
,
param
.
getPilotCertificationUserId
());
//TODO 被拒绝后应该退回飞手的押金
}
return
ResultBody
.
success
();
}
public
UserAccountSimpleDTO
feignGetUserSimpleInfo
(
Integer
userAccountId
,
HttpServletRequest
request
)
{
String
token
=
request
.
getHeader
(
"token"
);
...
...
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
浏览文件 @
5f5091b1
...
...
@@ -518,6 +518,7 @@
ri.service_id,
ri.repertory,
ri.require_num,
ri.father_require_id,
ra.total_amount,
ri.insurance,
sf.doing,
...
...
@@ -633,7 +634,7 @@
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},
2
,
#{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber},
10
,
#{preemptTotalAmount}, #{openid}, NOW(), NOW(), #{phoneNum});
</insert>
...
...
@@ -718,6 +719,7 @@
#{userAccountId});
</insert>
<select
id=
"evaluateDetails"
resultType=
"com.mmc.csf.release.entity.requirements.ServiceEvaluateDO"
>
select id,
evaluation_content,
...
...
@@ -1589,7 +1591,7 @@
select count(ri.id) from requirements_service rs
inner join requirements_info ri on ri.id = rs.requirements_info_id
where ri.father_require_id =#{fatherRequireId}
and rs.pilot_certification_user_id = #{userId}
and rs.pilot_certification_user_id = #{userId}
and rs.is_deleted = 0
</select>
<select
id=
"selectRequireSonInfo"
resultType=
"com.mmc.csf.release.entity.requirements.RequirementsInfoDO"
>
SELECT
...
...
@@ -1632,9 +1634,31 @@
ORDER BY ri.id desc
limit #{pageNo}, #{pageSize}
</select>
<select
id=
"selectFatherRequireIdBySonId"
resultType=
"java.lang.Integer"
>
select father_require_id from requirements_info
where id = #{requireInfoId}
</select>
<select
id=
"selectRepertoryByRequireId"
resultType=
"java.lang.Integer"
>
select count(id) from requirements_info where father_require_id = #{requireInfoId}
and repertory = 1
</select>
<update
id=
"updateRequirementsInfoRepertory"
>
update requirements_info set repertory = #{fatherRepertory}
where id = #{fatherRequireId}
</update>
<update
id=
"updateRequirementsInfoByRefusePilot"
>
update requirements_info
set repertory = 1,service_flow_id = 1
where id=#{requireInfoId}
</update>
<update
id=
"updateRequirementsService"
>
update requirements_service set is_deleted = 1
where requirements_info_id = #{requireInfoId} and pilot_certification_user_id = #{pilotUserId}
</update>
<insert
id=
"insertAgreePilotOrder"
>
insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
values(#{requireInfoId},#{serviceFlowId},#{pilotCertificationUserId},NOW())
</insert>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论