Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
f5456fb6
提交
f5456fb6
authored
11月 09, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test
上级
2ebc9a91
ae758136
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
85 行增加
和
4 行删除
+85
-4
OrderChildLogEnum.java
...ain/java/com/clx/performance/enums/OrderChildLogEnum.java
+1
-0
DriverCancelOrderChildInfo.java
...com/clx/performance/vo/pc/DriverCancelOrderChildInfo.java
+34
-0
OrderCancelComponent.java
...a/com/clx/performance/component/OrderCancelComponent.java
+7
-0
CarrierOrderChildController.java
...erformance/controller/pc/CarrierOrderChildController.java
+6
-0
OrderChildService.java
...n/java/com/clx/performance/service/OrderChildService.java
+1
-0
OrderCancelServiceImpl.java
.../clx/performance/service/impl/OrderCancelServiceImpl.java
+12
-0
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+13
-0
OrderGoodsServiceImpl.java
...m/clx/performance/service/impl/OrderGoodsServiceImpl.java
+11
-4
没有找到文件。
performance-api/src/main/java/com/clx/performance/enums/OrderChildLogEnum.java
浏览文件 @
f5456fb6
...
@@ -56,6 +56,7 @@ public enum OrderChildLogEnum {
...
@@ -56,6 +56,7 @@ public enum OrderChildLogEnum {
OWNER
(
1
,
"货主"
),
OWNER
(
1
,
"货主"
),
PLATFORM
(
2
,
"承运"
),
PLATFORM
(
2
,
"承运"
),
DRIVER
(
3
,
"司机"
),
DRIVER
(
3
,
"司机"
),
ARTIFICIAL
(
4
,
"客服"
),
;
;
...
...
performance-api/src/main/java/com/clx/performance/vo/pc/DriverCancelOrderChildInfo.java
0 → 100644
浏览文件 @
f5456fb6
package
com
.
clx
.
performance
.
vo
.
pc
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.*
;
import
java.math.BigDecimal
;
import
java.util.List
;
/**
* @ClassName OrderChildBussInfoVO
* @Description
* @Author kavin
* @Date 2023/9/24 17:41
* @Version 1.0
*/
@ApiModel
(
description
=
"司机取消运单-运单详情"
)
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public
class
DriverCancelOrderChildInfo
{
@ApiModelProperty
(
value
=
"取消原因"
)
private
String
cancelRemark
;
@ApiModelProperty
(
value
=
"取消详细原因"
)
private
String
cancelDetail
;
@ApiModelProperty
(
value
=
"图片集合"
)
private
List
<
String
>
imageList
;
}
performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java
浏览文件 @
f5456fb6
...
@@ -15,6 +15,7 @@ import com.clx.performance.model.OrderChild;
...
@@ -15,6 +15,7 @@ import com.clx.performance.model.OrderChild;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.service.IntegralMqService
;
import
com.clx.performance.service.IntegralMqService
;
import
com.clx.performance.service.OrderChildLogService
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderGoodsTruckBindService
;
import
com.clx.performance.service.OrderGoodsTruckBindService
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService
;
...
@@ -59,6 +60,8 @@ public class OrderCancelComponent implements InitializingBean {
...
@@ -59,6 +60,8 @@ public class OrderCancelComponent implements InitializingBean {
private
final
IntegralMqService
integralMqService
;
private
final
IntegralMqService
integralMqService
;
private
final
OrderChildLogService
orderChildLogService
;
public
void
ownerProcess
(
OrderCancelParam
param
)
{
public
void
ownerProcess
(
OrderCancelParam
param
)
{
String
orderNo
=
param
.
getOrderNo
();
String
orderNo
=
param
.
getOrderNo
();
List
<
OrderGoods
>
orderGoodsList
=
null
;
List
<
OrderGoods
>
orderGoodsList
=
null
;
...
@@ -122,6 +125,10 @@ public class OrderCancelComponent implements InitializingBean {
...
@@ -122,6 +125,10 @@ public class OrderCancelComponent implements InitializingBean {
//释放车辆
//释放车辆
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
childNoList
.
add
(
orderChild
.
getChildNo
());
childNoList
.
add
(
orderChild
.
getChildNo
());
orderChildLogService
.
saveOrderChildLog
(
orderChild
.
getChildNo
(),
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getCode
(),
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getName
(),
OrderChildLogEnum
.
CreateType
.
OWNER
.
getCode
(),
0L
,
OrderChildLogEnum
.
CreateType
.
OWNER
.
getMsg
()
);
}
}
Map
<
String
,
List
<
OrderChild
>>
orderChildMap
=
new
HashMap
<>();
Map
<
String
,
List
<
OrderChild
>>
orderChildMap
=
new
HashMap
<>();
...
...
performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java
浏览文件 @
f5456fb6
...
@@ -91,6 +91,12 @@ public class CarrierOrderChildController {
...
@@ -91,6 +91,12 @@ public class CarrierOrderChildController {
return
Result
.
page
(
page
.
getRecords
(),
page
.
getTotal
(),
page
.
getPages
());
return
Result
.
page
(
page
.
getRecords
(),
page
.
getTotal
(),
page
.
getPages
());
}
}
@ApiOperation
(
value
=
"司机取消运单-运单详情"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/driverCancelOrderChildInfo"
)
public
Result
<
DriverCancelOrderChildInfo
>
driverCancelOrderChildInfo
(
@NotBlank
(
message
=
"运单编号不能为空"
)
String
orderChildNo
)
{
return
Result
.
ok
(
orderChildService
.
driverCancelOrderChildInfo
(
orderChildNo
));
}
//模拟
//模拟
@GetMapping
(
"/orderChildExpect"
)
@GetMapping
(
"/orderChildExpect"
)
public
void
getMonitorOrerChildListsByParam
()
{
public
void
getMonitorOrerChildListsByParam
()
{
...
...
performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
浏览文件 @
f5456fb6
...
@@ -80,4 +80,5 @@ public interface OrderChildService {
...
@@ -80,4 +80,5 @@ public interface OrderChildService {
void
orderChildFinish
(
String
childNo
);
void
orderChildFinish
(
String
childNo
);
DriverCancelOrderChildInfo
driverCancelOrderChildInfo
(
String
orderChildNo
);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @
f5456fb6
...
@@ -21,6 +21,7 @@ import com.clx.performance.model.OrderGoods;
...
@@ -21,6 +21,7 @@ import com.clx.performance.model.OrderGoods;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.param.pc.owner.ThawAccountParam
;
import
com.clx.performance.param.pc.owner.ThawAccountParam
;
import
com.clx.performance.service.OrderCancelService
;
import
com.clx.performance.service.OrderCancelService
;
import
com.clx.performance.service.OrderChildLogService
;
import
com.clx.performance.service.OrderGoodsTruckBindService
;
import
com.clx.performance.service.OrderGoodsTruckBindService
;
import
com.clx.performance.service.OwnerAccountService
;
import
com.clx.performance.service.OwnerAccountService
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService
;
...
@@ -73,6 +74,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -73,6 +74,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
private
final
OrderCancelComponent
orderCancelComponent
;
private
final
OrderCancelComponent
orderCancelComponent
;
private
final
OrderChildLogService
orderChildLogService
;
@Override
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
...
@@ -122,6 +125,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -122,6 +125,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
//释放车辆
//释放车辆
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
childNoList
.
add
(
orderChild
.
getChildNo
());
childNoList
.
add
(
orderChild
.
getChildNo
());
orderChildLogService
.
saveOrderChildLog
(
orderChild
.
getChildNo
(),
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getCode
(),
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getName
(),
OrderChildLogEnum
.
CreateType
.
PLATFORM
.
getCode
(),
0L
,
OrderChildLogEnum
.
CreateType
.
PLATFORM
.
getMsg
()
);
}
}
if
(
CollectionUtil
.
isNotEmpty
(
childNoList
))
{
if
(
CollectionUtil
.
isNotEmpty
(
childNoList
))
{
...
@@ -696,6 +703,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -696,6 +703,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
orderChildDao
.
updateEntityByKey
(
update
);
orderChildDao
.
updateEntityByKey
(
update
);
orderCancelComponent
.
backFillTonnageForArtificial
(
orderChild
.
getOrderGoodsNo
(),
orderChild
.
getWeight
());
orderCancelComponent
.
backFillTonnageForArtificial
(
orderChild
.
getOrderGoodsNo
(),
orderChild
.
getWeight
());
orderChildLogService
.
saveOrderChildLog
(
orderChild
.
getChildNo
(),
OrderChildEnum
.
Status
.
ARTIFICIAL_CANCEL
.
getCode
(),
OrderChildEnum
.
Status
.
ARTIFICIAL_CANCEL
.
getName
(),
OrderChildLogEnum
.
CreateType
.
ARTIFICIAL
.
getCode
(),
0L
,
OrderChildLogEnum
.
CreateType
.
ARTIFICIAL
.
getMsg
()
);
}
}
@Override
@Override
...
...
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
f5456fb6
...
@@ -1224,6 +1224,19 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -1224,6 +1224,19 @@ public class OrderChildServiceImpl implements OrderChildService {
}
}
@Override
public
DriverCancelOrderChildInfo
driverCancelOrderChildInfo
(
String
orderChildNo
)
{
DriverCancelOrderChildInfo
result
=
new
DriverCancelOrderChildInfo
();
List
<
OrderChildImage
>
images
=
orderChildImageDao
.
getImages
(
orderChildNo
,
OrderChildImage
.
Type
.
DRIVER_CANCEL
.
getCode
());
OrderChild
orderChild
=
orderChildDao
.
getByChildNo
(
orderChildNo
).
orElseThrow
(
PerformanceResultEnum
.
ORDER_CHILD_NO_FOUND
);
result
.
setCancelDetail
(
orderChild
.
getCancelDetail
());
result
.
setCancelRemark
(
orderChild
.
getCancelRemark
());
if
(
CollectionUtils
.
isNotEmpty
(
images
))
{
result
.
setImageList
(
images
.
stream
().
map
(
OrderChildImage:
:
getImage
).
collect
(
Collectors
.
toList
()));
}
return
result
;
}
/**
/**
* 生成计费单
* 生成计费单
*/
*/
...
...
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @
f5456fb6
...
@@ -30,10 +30,7 @@ import com.clx.performance.param.app.OrderGoodsListPageParam;
...
@@ -30,10 +30,7 @@ import com.clx.performance.param.app.OrderGoodsListPageParam;
import
com.clx.performance.param.pc.OrderGoodsCancelParam
;
import
com.clx.performance.param.pc.OrderGoodsCancelParam
;
import
com.clx.performance.param.pc.UpdateEditOrderGoodsParam
;
import
com.clx.performance.param.pc.UpdateEditOrderGoodsParam
;
import
com.clx.performance.param.pc.UpdateOrderGoodsPriceParam
;
import
com.clx.performance.param.pc.UpdateOrderGoodsPriceParam
;
import
com.clx.performance.service.IntegralMqService
;
import
com.clx.performance.service.*
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderGoodsLogService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.struct.OrderGoodsStruct
;
import
com.clx.performance.struct.OrderGoodsStruct
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.feign.OrderGoodsFeignVO
;
import
com.clx.performance.vo.feign.OrderGoodsFeignVO
;
...
@@ -105,6 +102,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
...
@@ -105,6 +102,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
private
final
IntegralMqService
integralMqService
;
private
final
IntegralMqService
integralMqService
;
private
final
OrderChildLogService
orderChildLogService
;
@Override
@Override
public
OrderGoodsVO
getOrderGoodsInfoByOrderGoodsNoForPC
(
String
orderGoodsNo
)
{
public
OrderGoodsVO
getOrderGoodsInfoByOrderGoodsNoForPC
(
String
orderGoodsNo
)
{
OrderGoodsVO
orderGoodsVO
=
orderGoodsDao
.
getOrderGoodsInfoByOrderGoodsNoForPC
(
orderGoodsNo
).
map
(
orderGoodsStruct:
:
convert
).
get
();
OrderGoodsVO
orderGoodsVO
=
orderGoodsDao
.
getOrderGoodsInfoByOrderGoodsNoForPC
(
orderGoodsNo
).
map
(
orderGoodsStruct:
:
convert
).
get
();
...
@@ -527,6 +526,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
...
@@ -527,6 +526,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
childNoList
.
add
(
orderChild
.
getChildNo
());
childNoList
.
add
(
orderChild
.
getChildNo
());
sum
=
sum
.
add
(
orderChild
.
getWeight
());
sum
=
sum
.
add
(
orderChild
.
getWeight
());
orderChildLogService
.
saveOrderChildLog
(
orderChild
.
getChildNo
(),
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getCode
(),
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getName
(),
OrderChildLogEnum
.
CreateType
.
OWNER
.
getCode
(),
0L
,
OrderChildLogEnum
.
CreateType
.
OWNER
.
getMsg
()
);
}
}
orderChildDao
.
batchUpdateOrderChildStatus
(
orderChildDao
.
batchUpdateOrderChildStatus
(
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getCode
(),
"系统取消"
,
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getCode
(),
"系统取消"
,
...
@@ -574,6 +577,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
...
@@ -574,6 +577,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
driverService
.
updateOrderStatus
(
orderChild
.
getDriverUserNo
(),
DriverInfoEnum
.
DriverStatus
.
NO
.
getCode
(),
orderChild
.
getTruckId
(),
1
);
childNoList
.
add
(
orderChild
.
getChildNo
());
childNoList
.
add
(
orderChild
.
getChildNo
());
sum
=
sum
.
add
(
orderChild
.
getWeight
());
sum
=
sum
.
add
(
orderChild
.
getWeight
());
orderChildLogService
.
saveOrderChildLog
(
orderChild
.
getChildNo
(),
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getCode
(),
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getName
(),
OrderChildLogEnum
.
CreateType
.
OWNER
.
getCode
(),
0L
,
OrderChildLogEnum
.
CreateType
.
OWNER
.
getMsg
()
);
}
}
orderChildDao
.
batchUpdateOrderChildStatus
(
orderChildDao
.
batchUpdateOrderChildStatus
(
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getCode
(),
"系统取消"
,
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getCode
(),
"系统取消"
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论