Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
ims-ci-test
Commits
408e1895
提交
408e1895
authored
11月 10, 2023
作者:
恶龙咆哮
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop'
上级
d9b06cd4
64a44a71
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
443 行增加
和
1 行删除
+443
-1
AgreePilotOrderDTO.java
...n/java/com/mmc/csf/infomation/dto/AgreePilotOrderDTO.java
+30
-0
FlowDictionaryAndTimeDTO.java
.../com/mmc/csf/infomation/dto/FlowDictionaryAndTimeDTO.java
+2
-0
AgreeOrRefusePilotQO.java
.../java/com/mmc/csf/infomation/qo/AgreeOrRefusePilotQO.java
+24
-0
GrabTheOrderVO.java
...c/main/java/com/mmc/csf/infomation/vo/GrabTheOrderVO.java
+2
-0
OnlyRequirementsInfoId.java
...ava/com/mmc/csf/infomation/vo/OnlyRequirementsInfoId.java
+18
-0
RequirementsInfoVO.java
...in/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
+8
-0
ServiceRequirementsVO.java
...java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java
+4
-0
kustomization.yaml
kustomization/overlays/dev/kustomization.yaml
+1
-1
RequirementsController.java
...om/mmc/csf/release/controller/RequirementsController.java
+16
-0
RequirementsDao.java
...rc/main/java/com/mmc/csf/release/dao/RequirementsDao.java
+104
-0
RequirementsAmountDO.java
...csf/release/entity/requirements/RequirementsAmountDO.java
+16
-0
RequirementsInfoDO.java
...c/csf/release/entity/requirements/RequirementsInfoDO.java
+8
-0
ServiceRequirementsDO.java
...sf/release/entity/requirements/ServiceRequirementsDO.java
+5
-0
ServiceRequirementsSonDO.java
...release/entity/requirements/ServiceRequirementsSonDO.java
+188
-0
RequirementsService.java
...java/com/mmc/csf/release/service/RequirementsService.java
+17
-0
RequirementsServiceImpl.java
...mmc/csf/release/service/impl/RequirementsServiceImpl.java
+0
-0
RequirementsDao.xml
...rc/main/resources/mapper/requirements/RequirementsDao.xml
+0
-0
没有找到文件。
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/AgreePilotOrderDTO.java
0 → 100644
浏览文件 @
408e1895
package
com
.
mmc
.
csf
.
infomation
.
dto
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.Date
;
/**
* @author 张培
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public
class
AgreePilotOrderDTO
{
@ApiModelProperty
(
value
=
"订单id"
)
private
Integer
requirementsInfoId
;
@ApiModelProperty
(
value
=
"状态"
)
private
Integer
serviceFlowId
;
@JSONField
(
format
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
createTime
;
private
FlowDictionaryDTO
flowDictionaryDTO
;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/FlowDictionaryAndTimeDTO.java
浏览文件 @
408e1895
...
@@ -27,6 +27,8 @@ public class FlowDictionaryAndTimeDTO implements Serializable {
...
@@ -27,6 +27,8 @@ public class FlowDictionaryAndTimeDTO implements Serializable {
@ApiModelProperty
(
value
=
"抢单"
,
example
=
"抢单"
)
@ApiModelProperty
(
value
=
"抢单"
,
example
=
"抢单"
)
private
RequirementsServiceDTO
requirementsServiceDTO
;
private
RequirementsServiceDTO
requirementsServiceDTO
;
@ApiModelProperty
(
value
=
"需求方同意"
,
example
=
"需求方同意"
)
private
AgreePilotOrderDTO
agreePilotOrderDTO
;
//抵达现场地址
//抵达现场地址
// service_arrive_scene
// service_arrive_scene
@ApiModelProperty
(
value
=
"抵达现场"
,
example
=
"抵达现场"
)
@ApiModelProperty
(
value
=
"抵达现场"
,
example
=
"抵达现场"
)
...
...
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/AgreeOrRefusePilotQO.java
0 → 100644
浏览文件 @
408e1895
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/GrabTheOrderVO.java
浏览文件 @
408e1895
...
@@ -51,5 +51,7 @@ public class GrabTheOrderVO {
...
@@ -51,5 +51,7 @@ public class GrabTheOrderVO {
@ApiModelProperty
(
value
=
"手机号"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"手机号"
,
hidden
=
true
)
private
String
phoneNum
;
private
String
phoneNum
;
@ApiModelProperty
(
value
=
"订单需求总人数"
)
private
Integer
requireNum
;
}
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/OnlyRequirementsInfoId.java
0 → 100644
浏览文件 @
408e1895
package
com
.
mmc
.
csf
.
infomation
.
vo
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* @author 张培
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public
class
OnlyRequirementsInfoId
{
@ApiModelProperty
(
value
=
"订单id"
)
private
Integer
requirementsInfoId
;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java
浏览文件 @
408e1895
...
@@ -64,6 +64,8 @@ public class RequirementsInfoVO implements Serializable {
...
@@ -64,6 +64,8 @@ public class RequirementsInfoVO implements Serializable {
@ApiModelProperty
(
value
=
"任务纬度"
,
example
=
"44.344324"
)
@ApiModelProperty
(
value
=
"任务纬度"
,
example
=
"44.344324"
)
private
Double
latitude
;
private
Double
latitude
;
@ApiModelProperty
(
value
=
"订单的父订单id"
)
private
Integer
fatherRequireId
;
@ApiModelProperty
(
value
=
"需求描述"
,
example
=
"描述一下"
,
required
=
true
)
@ApiModelProperty
(
value
=
"需求描述"
,
example
=
"描述一下"
,
required
=
true
)
@NotNull
(
message
=
"需求描述不能为空"
,
groups
=
{
Insert
.
class
})
@NotNull
(
message
=
"需求描述不能为空"
,
groups
=
{
Insert
.
class
})
...
@@ -183,4 +185,10 @@ public class RequirementsInfoVO implements Serializable {
...
@@ -183,4 +185,10 @@ public class RequirementsInfoVO implements Serializable {
@ApiModelProperty
(
value
=
"创建时间"
)
@ApiModelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
private
Date
createTime
;
@ApiModelProperty
(
value
=
"还剩多少人可以抢单"
)
private
Integer
repertory
;
@ApiModelProperty
(
value
=
"订单共需多少人"
)
private
Integer
requireNum
;
}
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java
浏览文件 @
408e1895
...
@@ -113,4 +113,8 @@ public class ServiceRequirementsVO implements Serializable {
...
@@ -113,4 +113,8 @@ public class ServiceRequirementsVO implements Serializable {
@ApiModelProperty
(
value
=
"区编码"
,
required
=
false
)
@ApiModelProperty
(
value
=
"区编码"
,
required
=
false
)
private
Integer
districtCode
;
private
Integer
districtCode
;
@ApiModelProperty
(
value
=
"订单总共需要多少人"
)
private
Integer
requireNum
;
}
}
kustomization/overlays/dev/kustomization.yaml
浏览文件 @
408e1895
...
@@ -18,4 +18,4 @@ patches:
...
@@ -18,4 +18,4 @@ patches:
images
:
images
:
-
name
:
REGISTRY/NAMESPACE/IMAGE:TAG
-
name
:
REGISTRY/NAMESPACE/IMAGE:TAG
newName
:
mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
newName
:
mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
newTag
:
5b768dd050a69db88baacd372d9ebf0fb137f30a
newTag
:
97386bd54f4c23cce1e94e1ed1602aaa7512b695
release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java
浏览文件 @
408e1895
...
@@ -2,6 +2,7 @@ package com.mmc.csf.release.controller;
...
@@ -2,6 +2,7 @@ package com.mmc.csf.release.controller;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.infomation.dto.*
;
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.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
@@ -13,6 +14,7 @@ import com.mmc.csf.release.model.group.Page;
...
@@ -13,6 +14,7 @@ import com.mmc.csf.release.model.group.Page;
import
com.mmc.csf.release.model.group.Update
;
import
com.mmc.csf.release.model.group.Update
;
import
com.mmc.csf.release.service.RequirementsService
;
import
com.mmc.csf.release.service.RequirementsService
;
import
io.swagger.annotations.*
;
import
io.swagger.annotations.*
;
import
io.swagger.models.auth.In
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -358,5 +360,19 @@ public class RequirementsController extends BaseController {
...
@@ -358,5 +360,19 @@ public class RequirementsController extends BaseController {
return
requirementsService
.
deleteRequire
(
requirementsInfoId
,
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
());
return
requirementsService
.
deleteRequire
(
requirementsInfoId
,
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
());
}
}
@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
){
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
浏览文件 @
408e1895
package
com
.
mmc
.
csf
.
release
.
dao
;
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.dto.*
;
import
com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO
;
import
com.mmc.csf.infomation.qo.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
@@ -85,6 +87,9 @@ public interface RequirementsDao {
...
@@ -85,6 +87,9 @@ public interface RequirementsDao {
void
addPublishService
(
ServiceRequirementsDO
requirementsInfoDO
);
void
addPublishService
(
ServiceRequirementsDO
requirementsInfoDO
);
void
addPublishServiceSon
(
ServiceRequirementsSonDO
serviceRequirementsSonDO
);
ServiceRequirementsDO
grabTheOrder
(
Integer
requirementsInfoId
);
ServiceRequirementsDO
grabTheOrder
(
Integer
requirementsInfoId
);
void
updateGrabTheOrder
(
Integer
requirementsInfoId
,
Integer
repertory
);
void
updateGrabTheOrder
(
Integer
requirementsInfoId
,
Integer
repertory
);
...
@@ -158,6 +163,8 @@ public interface RequirementsDao {
...
@@ -158,6 +163,8 @@ public interface RequirementsDao {
ServiceArriveSceneDTO
serviceArriveSceneDTO
(
Integer
requirementsInfoId
);
ServiceArriveSceneDTO
serviceArriveSceneDTO
(
Integer
requirementsInfoId
);
AgreePilotOrderDTO
serviceAgreePilotOrderDTO
(
Integer
requirementsInfoId
);
ServiceFulfilATaskDTO
serviceFulfilATaskDTO
(
Integer
requirementsInfoId
);
ServiceFulfilATaskDTO
serviceFulfilATaskDTO
(
Integer
requirementsInfoId
);
ServiceSettleAccountsDTO
settleAccountsDTO
(
Integer
requirementsInfoId
);
ServiceSettleAccountsDTO
settleAccountsDTO
(
Integer
requirementsInfoId
);
...
@@ -217,4 +224,101 @@ public interface RequirementsDao {
...
@@ -217,4 +224,101 @@ public interface RequirementsDao {
BigDecimal
getServiceOrderAmount
();
BigDecimal
getServiceOrderAmount
();
/**
* 根据父订单获取子订单中没被抢的id
* @param fatherRequireId 父订单id
* @return {@link Integer} 没被抢的子订单id 只返回一个
*/
Integer
getRequirementsSonInfoId
(
Integer
fatherRequireId
);
/**
* 修改父订单中还需多少人字段
* @param fatherRequireId 父订单id
* @param fatherRepertory 还需多少人
* @return {@link Integer}
*/
Integer
updateRequirementsInfoRepertory
(
Integer
fatherRequireId
,
Integer
fatherRepertory
);
/**
* 查找用户有没有已经抢过这个多人订单了
* @param fatherRequireId 父订单id
* @param userId 抢单用户id
* @return {@link Integer}1 就是已经抢过这个订单了 0 就是没抢过
*/
Integer
selectBooleanByFatherIdAndUserId
(
Integer
fatherRequireId
,
Integer
userId
);
/**
* 根据父订单id 查找所有子订单信息
* @param param 父订单id
* @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
);
/**
* 根据订单id和飞手用户id查询该飞手是被拒绝还是同意
* @param requirementsId 订单id 对应requirement_info表的id
* @param userAccountId 用户的id
* @return {@link Integer} 2 就是同意 11 是拒绝
*/
Integer
selectServiceIdByRequireIdAndUserId
(
Integer
requirementsId
,
Integer
userAccountId
);
/**
* 根绝订单id获取所需总人数
* @param requirementsId 订单id
* @return {@link Integer}
*/
Integer
selectRequirementsNum
(
Integer
requirementsId
);
/**
* 根据父订单id查询不满足状态条件的子订单数量
* @param requirementsId 父订单id
* @return {@link Integer}
*/
Integer
selectServiceFlowIdByFatherId
(
Integer
requirementsId
);
/**
* 去抢单表中查看用户是否被拒绝过
* @param requireId 订单的id
* @param userAccountId 抢单飞手的用户id
* @return {@link Integer}
*/
Integer
selectRequirementsRefuse
(
Integer
requireId
,
Integer
userAccountId
);
}
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsAmountDO.java
浏览文件 @
408e1895
...
@@ -98,6 +98,22 @@ public class RequirementsAmountDO implements Serializable {
...
@@ -98,6 +98,22 @@ public class RequirementsAmountDO implements Serializable {
this
.
levelWeChatAmount
=
requirementsInfoDO
.
getLevelWeChatAmount
();
this
.
levelWeChatAmount
=
requirementsInfoDO
.
getLevelWeChatAmount
();
this
.
levelCashAmount
=
requirementsInfoDO
.
getLevelCashAmount
();
this
.
levelCashAmount
=
requirementsInfoDO
.
getLevelCashAmount
();
}
}
public
RequirementsAmountDO
(
ServiceRequirementsSonDO
requirementsInfoDO
)
{
this
.
requirementsInfoId
=
requirementsInfoDO
.
getId
();
this
.
orderAmount
=
requirementsInfoDO
.
getOrderAmount
();
this
.
totalAmount
=
requirementsInfoDO
.
getTotalAmount
();
this
.
orderLevelAmount
=
requirementsInfoDO
.
getOrderLevelAmount
();
this
.
orderLevel
=
requirementsInfoDO
.
getOrderLevel
();
this
.
weChat
=
requirementsInfoDO
.
getWeChat
();
this
.
salaryAmount
=
requirementsInfoDO
.
getSalaryAmount
();
this
.
wechatPayOrderNumber
=
requirementsInfoDO
.
getWechatPayOrderNumber
();
this
.
userAccountId
=
requirementsInfoDO
.
getUserAccountId
();
this
.
cashAmount
=
requirementsInfoDO
.
getCashAmount
();
this
.
levelSalaryAmount
=
requirementsInfoDO
.
getLevelSalaryAmount
();
this
.
levelWeChatAmount
=
requirementsInfoDO
.
getLevelWeChatAmount
();
this
.
levelCashAmount
=
requirementsInfoDO
.
getLevelCashAmount
();
}
public
RequirementsAmountDO
(
ServiceRequirementsEditVO
requirementsEditVO
)
{
public
RequirementsAmountDO
(
ServiceRequirementsEditVO
requirementsEditVO
)
{
this
.
orderAmount
=
requirementsEditVO
.
getOrderAmount
();
this
.
orderAmount
=
requirementsEditVO
.
getOrderAmount
();
...
...
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java
浏览文件 @
408e1895
...
@@ -93,6 +93,9 @@ public class RequirementsInfoDO implements Serializable {
...
@@ -93,6 +93,9 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty
(
value
=
"允许几人抢单"
,
example
=
"允许几人抢单"
)
@ApiModelProperty
(
value
=
"允许几人抢单"
,
example
=
"允许几人抢单"
)
private
Integer
repertory
;
private
Integer
repertory
;
@ApiModelProperty
(
value
=
"任务所需总人数"
)
private
Integer
requireNum
;
private
String
insurance
;
private
String
insurance
;
private
String
doing
;
private
String
doing
;
...
@@ -177,6 +180,8 @@ public class RequirementsInfoDO implements Serializable {
...
@@ -177,6 +180,8 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty
(
value
=
"发布者openid"
)
@ApiModelProperty
(
value
=
"发布者openid"
)
private
String
openid
;
private
String
openid
;
@ApiModelProperty
(
value
=
"订单的父订单id"
)
private
Integer
fatherRequireId
;
public
RequirementsInfoVO
buildRequirementsInfoVO
()
{
public
RequirementsInfoVO
buildRequirementsInfoVO
()
{
...
@@ -191,6 +196,7 @@ public class RequirementsInfoDO implements Serializable {
...
@@ -191,6 +196,7 @@ public class RequirementsInfoDO implements Serializable {
.
requireUrl
(
this
.
requireUrl
)
.
requireUrl
(
this
.
requireUrl
)
.
orderLevelEnum
(
this
.
orderLevel
)
.
orderLevelEnum
(
this
.
orderLevel
)
.
serviceId
(
this
.
serviceId
)
.
serviceId
(
this
.
serviceId
)
.
fatherRequireId
(
this
.
fatherRequireId
)
.
serviceName
(
this
.
serviceName
)
.
serviceName
(
this
.
serviceName
)
.
totalAmount
(
this
.
totalAmount
)
.
totalAmount
(
this
.
totalAmount
)
.
insurance
(
this
.
insurance
)
.
insurance
(
this
.
insurance
)
...
@@ -211,6 +217,8 @@ public class RequirementsInfoDO implements Serializable {
...
@@ -211,6 +217,8 @@ public class RequirementsInfoDO implements Serializable {
.
preemptPhone
(
this
.
preemptPhone
)
.
preemptPhone
(
this
.
preemptPhone
)
.
pilotCertificationId
(
this
.
pilotCertificationId
)
.
pilotCertificationId
(
this
.
pilotCertificationId
)
.
createTime
(
this
.
createTime
)
.
createTime
(
this
.
createTime
)
.
repertory
(
this
.
repertory
)
.
requireNum
(
this
.
requireNum
)
.
build
();
.
build
();
}
}
...
...
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java
浏览文件 @
408e1895
...
@@ -145,6 +145,8 @@ public class ServiceRequirementsDO {
...
@@ -145,6 +145,8 @@ public class ServiceRequirementsDO {
@ApiModelProperty
(
value
=
"服务名称"
)
@ApiModelProperty
(
value
=
"服务名称"
)
private
String
serviceName
;
private
String
serviceName
;
@ApiModelProperty
(
value
=
"订单总共所需多少人"
)
private
Integer
requireNum
;
public
ServiceRequirementsDO
(
ServiceRequirementsVO
serviceRequirementsVO
)
{
public
ServiceRequirementsDO
(
ServiceRequirementsVO
serviceRequirementsVO
)
{
this
.
id
=
serviceRequirementsVO
.
getId
();
this
.
id
=
serviceRequirementsVO
.
getId
();
...
@@ -172,5 +174,8 @@ public class ServiceRequirementsDO {
...
@@ -172,5 +174,8 @@ public class ServiceRequirementsDO {
this
.
provinceCode
=
serviceRequirementsVO
.
getProvinceCode
();
this
.
provinceCode
=
serviceRequirementsVO
.
getProvinceCode
();
this
.
cityCode
=
serviceRequirementsVO
.
getCityCode
();
this
.
cityCode
=
serviceRequirementsVO
.
getCityCode
();
this
.
districtCode
=
serviceRequirementsVO
.
getDistrictCode
();
this
.
districtCode
=
serviceRequirementsVO
.
getDistrictCode
();
this
.
requireNum
=
serviceRequirementsVO
.
getRequireNum
();
}
}
}
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsSonDO.java
0 → 100644
浏览文件 @
408e1895
package
com
.
mmc
.
csf
.
release
.
entity
.
requirements
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.mmc.csf.config.IsNullConvertZero
;
import
com.mmc.csf.infomation.vo.OrderLevelEnum
;
import
com.mmc.csf.release.model.group.Insert
;
import
com.mmc.csf.release.model.group.Update
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.util.Date
;
/**
* @author 张培
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
ServiceRequirementsSonDO
{
@ApiModelProperty
(
value
=
"id"
)
@NotNull
(
message
=
"id不能为空"
,
groups
=
{
Update
.
class
})
private
Integer
id
;
@ApiModelProperty
(
value
=
"id"
)
@NotBlank
(
message
=
"服务类型id不能为空"
,
groups
=
{
Insert
.
class
,
Update
.
class
})
private
Integer
serviceId
;
@ApiModelProperty
(
value
=
"飞行日期——任务开始时间"
,
example
=
"2023-07-25"
,
required
=
true
)
@NotNull
(
message
=
"任务开始时间不能为空"
,
groups
=
{
Insert
.
class
,
Update
.
class
})
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
taskStartTime
;
@ApiModelProperty
(
value
=
"飞行日期——任务结束时间"
,
example
=
"2023-07-26"
,
required
=
true
)
@NotNull
(
message
=
"任务开始时间不能为空"
,
groups
=
{
Insert
.
class
,
Update
.
class
})
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
taskEndTime
;
@ApiModelProperty
(
value
=
"飞行位置——任务地址"
,
example
=
"广东省深圳市"
,
required
=
true
)
@NotBlank
(
message
=
"任务地址不能为空"
,
groups
=
{
Insert
.
class
,
Update
.
class
})
private
String
taskAddress
;
@ApiModelProperty
(
value
=
"飞行位置——任务经度"
,
example
=
"23.344324"
)
private
Double
longitude
;
@ApiModelProperty
(
value
=
"飞行位置——任务纬度"
,
example
=
"44.344324"
)
private
Double
latitude
;
@ApiModelProperty
(
value
=
"省份编码"
,
required
=
false
)
//@NotNull(message = "省份编码不能为空", groups = {Insert.class})
private
Integer
provinceCode
;
@ApiModelProperty
(
value
=
"市编码"
,
required
=
false
)
private
Integer
cityCode
;
@ApiModelProperty
(
value
=
"区编码"
,
required
=
false
)
private
Integer
districtCode
;
@ApiModelProperty
(
value
=
"需求描述"
,
example
=
"描述一下"
,
required
=
true
)
@NotNull
(
message
=
"需求描述不能为空"
,
groups
=
{
Insert
.
class
})
@Length
(
max
=
300
,
message
=
"字符过长"
)
private
String
requireDescription
;
@ApiModelProperty
(
value
=
"订单金额"
,
example
=
"订单金额"
,
required
=
true
)
@NotNull
(
message
=
"订单金额"
,
groups
=
{
Insert
.
class
})
@IsNullConvertZero
private
BigDecimal
orderAmount
;
@ApiModelProperty
(
value
=
"飞手保险"
,
example
=
"飞手保险"
,
required
=
true
)
@NotNull
(
message
=
"飞手保险"
,
groups
=
{
Insert
.
class
})
private
String
insurance
;
@ApiModelProperty
(
value
=
"订单级别"
,
example
=
"订单级别"
,
required
=
true
)
@NotNull
(
message
=
"订单级别"
,
groups
=
{
Insert
.
class
})
private
OrderLevelEnum
orderLevelEnum
;
@ApiModelProperty
(
value
=
"后台获取token里面的用户id"
,
hidden
=
true
)
private
Integer
userAccountId
;
@ApiModelProperty
(
value
=
"发布者姓名"
,
example
=
"张三"
)
private
String
publishName
;
@ApiModelProperty
(
value
=
"发布者电话"
,
example
=
"1892994543"
,
required
=
true
)
@NotNull
(
message
=
"发布者电话不能为空"
,
groups
=
{
Insert
.
class
})
private
String
publishPhone
;
@ApiModelProperty
(
value
=
"发布者订单编号"
)
private
String
publisherNumber
;
@ApiModelProperty
(
value
=
"0普通 100急单 300置顶"
)
@IsNullConvertZero
private
BigDecimal
orderLevelAmount
;
@ApiModelProperty
(
value
=
"订单级别 REGULAR_ORDER,RUSH_ORDER,TOP_ORDER"
)
private
String
orderLevel
;
@ApiModelProperty
(
value
=
"总金额"
,
example
=
"100"
,
required
=
true
)
@NotNull
(
message
=
"总金额"
,
groups
=
{
Insert
.
class
})
@IsNullConvertZero
private
BigDecimal
totalAmount
;
@ApiModelProperty
(
value
=
"云享金"
,
example
=
"10"
)
@IsNullConvertZero
private
BigDecimal
cashAmount
;
@ApiModelProperty
(
value
=
"佣金"
,
example
=
"10"
)
@IsNullConvertZero
private
BigDecimal
salaryAmount
;
@ApiModelProperty
(
value
=
"微信金额"
,
example
=
"10"
)
@IsNullConvertZero
private
BigDecimal
weChat
;
@ApiModelProperty
(
value
=
"微信支付订单编号"
,
example
=
"R202308191657303116170"
)
private
String
wechatPayOrderNumber
;
private
Integer
repertory
;
@ApiModelProperty
(
value
=
"支付方式,云享金:1,佣金:2,微信支付:3"
,
example
=
"1,2,3"
)
private
String
paymentType
;
@ApiModelProperty
(
value
=
"地区编码"
)
private
String
adcode
;
@IsNullConvertZero
@ApiModelProperty
(
value
=
"置顶/加急 佣金支付多少"
,
example
=
"100"
)
private
BigDecimal
levelSalaryAmount
;
@ApiModelProperty
(
value
=
"置顶/加急 微信支付多少"
,
example
=
"100"
)
@IsNullConvertZero
private
BigDecimal
levelWeChatAmount
;
@ApiModelProperty
(
value
=
"置顶/加急 云享金支付多少"
,
example
=
"100"
)
@IsNullConvertZero
private
BigDecimal
levelCashAmount
;
@ApiModelProperty
(
value
=
"openid"
)
private
String
openid
;
@ApiModelProperty
(
value
=
"服务名称"
)
private
String
serviceName
;
@ApiModelProperty
(
value
=
"订单总共所需多少人"
)
private
Integer
requireNum
;
@ApiModelProperty
(
value
=
"上级订单id"
)
private
Integer
fatherRequireId
;
public
ServiceRequirementsSonDO
(
ServiceRequirementsDO
serviceRequirementsDO
)
{
BigDecimal
decimalSum
=
new
BigDecimal
(
serviceRequirementsDO
.
getRequireNum
());
this
.
serviceId
=
serviceRequirementsDO
.
getServiceId
();
this
.
taskStartTime
=
serviceRequirementsDO
.
getTaskStartTime
();
this
.
taskEndTime
=
serviceRequirementsDO
.
getTaskEndTime
();
this
.
taskAddress
=
serviceRequirementsDO
.
getTaskAddress
();
this
.
longitude
=
serviceRequirementsDO
.
getLongitude
();
this
.
latitude
=
serviceRequirementsDO
.
getLatitude
();
this
.
provinceCode
=
serviceRequirementsDO
.
getProvinceCode
();
this
.
cityCode
=
serviceRequirementsDO
.
getCityCode
();
this
.
districtCode
=
serviceRequirementsDO
.
getDistrictCode
();
this
.
requireDescription
=
serviceRequirementsDO
.
getRequireDescription
();
this
.
orderAmount
=
serviceRequirementsDO
.
getOrderAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
insurance
=
serviceRequirementsDO
.
getInsurance
();
this
.
orderLevelEnum
=
serviceRequirementsDO
.
getOrderLevelEnum
();
this
.
userAccountId
=
serviceRequirementsDO
.
getUserAccountId
();
this
.
publishName
=
serviceRequirementsDO
.
getPublishName
();
this
.
publishPhone
=
serviceRequirementsDO
.
getPublishPhone
();
this
.
publisherNumber
=
serviceRequirementsDO
.
getPublisherNumber
();
this
.
orderLevelAmount
=
serviceRequirementsDO
.
getOrderLevelAmount
();
this
.
orderLevel
=
serviceRequirementsDO
.
getOrderLevel
();
this
.
totalAmount
=
serviceRequirementsDO
.
getTotalAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
cashAmount
=
serviceRequirementsDO
.
getCashAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
salaryAmount
=
serviceRequirementsDO
.
getSalaryAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
weChat
=
serviceRequirementsDO
.
getWeChat
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
wechatPayOrderNumber
=
serviceRequirementsDO
.
getWechatPayOrderNumber
();
this
.
repertory
=
1
;
this
.
paymentType
=
serviceRequirementsDO
.
getPaymentType
();
this
.
adcode
=
serviceRequirementsDO
.
getAdcode
();
this
.
levelSalaryAmount
=
serviceRequirementsDO
.
getLevelSalaryAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
levelWeChatAmount
=
serviceRequirementsDO
.
getLevelWeChatAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
levelCashAmount
=
serviceRequirementsDO
.
getLevelCashAmount
().
divide
(
decimalSum
,
2
,
RoundingMode
.
HALF_UP
);
this
.
openid
=
serviceRequirementsDO
.
getOpenid
();
this
.
serviceName
=
serviceRequirementsDO
.
getServiceName
();
this
.
requireNum
=
1
;
this
.
fatherRequireId
=
serviceRequirementsDO
.
getId
();
}
}
release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java
浏览文件 @
408e1895
...
@@ -3,6 +3,7 @@ package com.mmc.csf.release.service;
...
@@ -3,6 +3,7 @@ package com.mmc.csf.release.service;
import
com.mmc.csf.common.util.page.PageResult
;
import
com.mmc.csf.common.util.page.PageResult
;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.common.util.web.ResultBody
;
import
com.mmc.csf.infomation.dto.*
;
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.IndustryCaseQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPreemptQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
import
com.mmc.csf.infomation.qo.MyPublishQO
;
...
@@ -126,4 +127,20 @@ public interface RequirementsService {
...
@@ -126,4 +127,20 @@ public interface RequirementsService {
ResultBody
flyHandAgree
(
FlyHandAgreeVO
agreeVO
,
HttpServletRequest
request
);
ResultBody
flyHandAgree
(
FlyHandAgreeVO
agreeVO
,
HttpServletRequest
request
);
ServiceRequirementsDO
getRepertory
(
GrabTheOrderVO
grabTheOrderVO
,
HttpServletRequest
request
);
ServiceRequirementsDO
getRepertory
(
GrabTheOrderVO
grabTheOrderVO
,
HttpServletRequest
request
);
/**
* 根据父订单的id找到所有子订单信息
* @param userAccountId 发单人的id
* @param param 条件 父id在里面
* @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
浏览文件 @
408e1895
This source diff could not be displayed because it is too large. You can
view the blob
instead.
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
浏览文件 @
408e1895
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论