Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
4da8f242
提交
4da8f242
authored
11月 08, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug修复
上级
13273150
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
4 行增加
和
5 行删除
+4
-5
OrderCancelServiceImpl.java
.../clx/performance/service/impl/OrderCancelServiceImpl.java
+4
-4
TruckServiceImpl.java
...va/com/clx/performance/service/impl/TruckServiceImpl.java
+0
-1
没有找到文件。
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @
4da8f242
...
@@ -87,7 +87,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -87,7 +87,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
NETWORK
.
getCode
());
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
ORDINARY
.
getCode
());
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
this
.
ownerConfirmCancelProcess
(
orderNo
);
this
.
ownerConfirmCancelProcess
(
orderNo
);
...
@@ -171,7 +171,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -171,7 +171,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
NETWORK
.
getCode
());
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
ORDINARY
.
getCode
());
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
...
@@ -330,7 +330,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -330,7 +330,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
NETWORK
.
getCode
());
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
ORDINARY
.
getCode
());
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
...
@@ -463,7 +463,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -463,7 +463,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
//TODO 注意判断普通单还是网运单 普通单类型 1 网运单 2
//TODO 注意判断普通单还是网运单 普通单类型 1 网运单 2
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
ThawAccountParam
thawAccountParam
=
new
ThawAccountParam
();
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderNo
(
orderNo
);
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
NETWORK
.
getCode
());
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
ORDINARY
.
getCode
());
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
...
...
performance-web/src/main/java/com/clx/performance/service/impl/TruckServiceImpl.java
浏览文件 @
4da8f242
...
@@ -250,7 +250,6 @@ public class TruckServiceImpl implements TruckService {
...
@@ -250,7 +250,6 @@ public class TruckServiceImpl implements TruckService {
private
Map
<
String
,
Integer
>
getTruckStatusMap
(){
private
Map
<
String
,
Integer
>
getTruckStatusMap
(){
//查询平台所有车辆的出车状态信息
//查询平台所有车辆的出车状态信息
Result
<
List
<
TruckUseStatusVO
>>
result
=
userClxFeign
.
getPlatformTruckStatus
();
Result
<
List
<
TruckUseStatusVO
>>
result
=
userClxFeign
.
getPlatformTruckStatus
();
log
.
info
(
"通过clx-user服务获取平台认证成功车辆出车状态列表,返回结果:{}"
,
JSON
.
toJSONString
(
result
));
if
(!
Objects
.
equals
(
result
.
getCode
(),
ResultCodeEnum
.
SUCCESS
.
getCode
())){
if
(!
Objects
.
equals
(
result
.
getCode
(),
ResultCodeEnum
.
SUCCESS
.
getCode
())){
throw
new
ServiceSystemException
(
ResultEnum
.
DATA_NOT_FIND
,
"查询车辆出车状态信息失败"
);
throw
new
ServiceSystemException
(
ResultEnum
.
DATA_NOT_FIND
,
"查询车辆出车状态信息失败"
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论