记得上下班打卡 | 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
641c1447
Commit
641c1447
authored
Jul 07, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
估算运费
parent
759f7ec0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
performanceOrderList.html
...ngzai/kylin/performancesExpress/performanceOrderList.html
+5
-1
PerformanceExpressPerformanceOrderListAdminDao.java
...n/dao/PerformanceExpressPerformanceOrderListAdminDao.java
+1
-0
KylinOrderTicketsMapper.xml
...iquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
+1
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @
641c1447
...
@@ -132,12 +132,16 @@
...
@@ -132,12 +132,16 @@
title
:
'快递费'
,
title
:
'快递费'
,
formatter
:
function
(
value
,
row
,
index
)
{
formatter
:
function
(
value
,
row
,
index
)
{
var
expressType
=
''
;
var
expressType
=
''
;
var
freightPrice
=
row
.
freightPrice
;
if
(
row
.
expressType
==
1
)
{
if
(
row
.
expressType
==
1
)
{
expressType
=
"寄付"
;
expressType
=
"寄付"
;
}
else
{
}
else
{
expressType
=
"到付"
;
expressType
=
"到付"
;
}
}
return
'快递方式:'
+
expressType
+
'<br>'
+
'快递费:'
+
row
.
priceExpress
;
if
(
null
==
freightPrice
)
{
freightPrice
=
''
;
}
return
'快递方式:'
+
expressType
+
'<br>'
+
'已支付快递费:'
+
row
.
priceExpress
+
'<br>'
+
'预估快递费:'
+
freightPrice
;
}
}
},
},
{
{
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java
View file @
641c1447
...
@@ -24,5 +24,6 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
...
@@ -24,5 +24,6 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
String
mailno
;
String
mailno
;
Integer
expressStatus
;
Integer
expressStatus
;
Integer
freightPrice
;
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @
641c1447
...
@@ -283,6 +283,7 @@
...
@@ -283,6 +283,7 @@
kots.express_type,
kots.express_type,
oe.mailno,
oe.mailno,
oe.freight_price,
oe.express_status
oe.express_status
FROM kylin_order_tickets kot
FROM kylin_order_tickets kot
INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
...
...
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