记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
0087890d
Commit
0087890d
authored
Jul 22, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉system。out
parent
d8eebdee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
14 deletions
+6
-14
performanceOrderList.html
...ngzai/kylin/performancesExpress/performanceOrderList.html
+1
-1
PerformancesExpressServiceImpl.java
...ai/kylin/service/impl/PerformancesExpressServiceImpl.java
+5
-13
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @
0087890d
...
...
@@ -327,7 +327,7 @@
},
{
field
:
'orderExpressId'
,
title
:
'
订单
ID'
title
:
'
快递
ID'
},
{
field
:
'orderTicketsId'
,
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @
0087890d
...
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.client.admin.common.utils.StringUtils
;
import
com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil
;
import
com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.UploadUtil
;
import
com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.ZipMultiFileUtil
;
...
...
@@ -23,7 +22,6 @@ import com.liquidnet.service.kylin.entity.*;
import
com.liquidnet.service.kylin.mapper.*
;
import
com.liquidnet.service.kylin.service.IKylinOrderExpress
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -205,7 +203,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String
result
=
shunfengSignUtils
.
generateSignatureAndRequestNew
(
hBody
,
"/public/order/v1/placeOrder"
);
System
.
out
.
println
(
result
);
//
System.out.println(result);
HashMap
hashMap
=
new
HashMap
();
try
{
hashMap
=
JsonUtils
.
fromJson
(
result
,
HashMap
.
class
);
...
...
@@ -300,26 +298,20 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
}
public
ResponseDto
cancelOrder
(
PerformanceExpressSearchAdminParam
performanceExpressSearchAdminParam
)
{
log
.
error
(
"cancelOrder {}"
,
""
);
log
.
info
(
"cancelOrder {}"
,
""
);
log
.
debug
(
"cancelOrder {}"
,
""
);
List
<
String
>
ids
=
performanceExpressSearchAdminParam
.
getIds
();
Integer
[]
expressStatus
=
{
KylinTableStatusConst
.
ORDER_EXPRESS_STATUS1
,
KylinTableStatusConst
.
ORDER_EXPRESS_STATUS3
};
for
(
String
orderTicketsId
:
ids
)
{
log
.
error
(
"id {}"
,
orderTicketsId
);
KylinOrderExpress
orderExpressInfo
=
kylinOrderExpressMapper
.
selectOne
(
new
QueryWrapper
<
KylinOrderExpress
>().
eq
(
"order_tickets_id"
,
orderTicketsId
)
.
notIn
(
"express_status"
,
expressStatus
)
);
if
(
null
!=
orderExpressInfo
)
{
log
.
error
(
"orderExpressInfo {}"
,
"true"
);
Map
<
String
,
String
>
hBody
=
new
HashMap
<>();
hBody
.
put
(
"orderId"
,
orderExpressInfo
.
getOrderExpressCode
());
// 生成签名并请求
String
result
=
shunfengSignUtils
.
generateSignatureAndRequestNew
(
hBody
,
"/public/order/v1/cancelOrder"
);
HashMap
hashMap
=
JsonUtils
.
fromJson
(
result
,
HashMap
.
class
);
log
.
error
(
"result {}"
,
result
);
if
(
hashMap
.
get
(
"succ"
).
equals
(
"fail"
))
{
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
return
ResponseDto
.
failure
(
msg
);
...
...
@@ -366,7 +358,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String
result
=
shunfengSignUtils
.
generateSignatureAndRequestNew
(
hBody
,
"/public/order/v1/getResult"
);
HashMap
hashMap
=
JsonUtils
.
fromJson
(
result
,
HashMap
.
class
);
System
.
out
.
println
(
result
);
//
System.out.println(result);
if
(
hashMap
.
get
(
"succ"
).
equals
(
"fail"
))
{
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
return
ResponseDto
.
failure
(
msg
);
...
...
@@ -420,7 +412,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String
result
=
shunfengSignUtils
.
generateSignatureAndRequestNew
(
hBody
,
"/public/order/v1/getFreight"
);
HashMap
hashMap
=
JsonUtils
.
fromJson
(
result
,
HashMap
.
class
);
System
.
out
.
println
(
result
);
//
System.out.println(result);
if
(
hashMap
.
get
(
"succ"
).
equals
(
"fail"
))
{
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
return
ResponseDto
.
failure
(
msg
);
...
...
@@ -456,7 +448,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String
result
=
shunfengSignUtils
.
generateSignatureAndRequestNew
(
hBody
,
"/public/order/v1/getListFreight"
);
HashMap
hashMap
=
JsonUtils
.
fromJson
(
result
,
HashMap
.
class
);
System
.
out
.
println
(
result
);
//
System.out.println(result);
if
(
hashMap
.
get
(
"succ"
).
equals
(
"fail"
))
{
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
return
ResponseDto
.
failure
(
msg
);
...
...
@@ -498,7 +490,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求
String
result
=
shunfengSignUtils
.
generateSignatureAndRequestNew
(
hBody
,
"/public/order/v1/listOrderRoute"
);
HashMap
hashMap
=
JsonUtils
.
fromJson
(
result
,
HashMap
.
class
);
System
.
out
.
println
(
result
);
//
System.out.println(result);
if
(
hashMap
.
get
(
"succ"
).
equals
(
"fail"
))
{
String
msg
=
(
String
)
hashMap
.
get
(
"msg"
);
return
ResponseDto
.
failure
(
msg
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment