记得上下班打卡 | 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
8d566eeb
Commit
8d566eeb
authored
Jul 20, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
打印
parent
3ae024ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
12 deletions
+41
-12
performanceOrderList.html
...ngzai/kylin/performancesExpress/performanceOrderList.html
+19
-1
PerformancesExpressServiceImpl.java
...ai/kylin/service/impl/PerformancesExpressServiceImpl.java
+16
-11
application-test.yml
liquidnet-bus-config/liquidnet-config/application-test.yml
+6
-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 @
8d566eeb
...
@@ -80,6 +80,23 @@
...
@@ -80,6 +80,23 @@
var
orderStatusDic
=
[[
$
{@
dict
.
getType
(
'zhengzai_order_status'
)}]];
var
orderStatusDic
=
[[
$
{@
dict
.
getType
(
'zhengzai_order_status'
)}]];
function
printAjax
(
orderExpressId
)
{
var
configProvinces
=
{
url
:
prefix
+
"/print"
,
type
:
"post"
,
dataType
:
"json"
,
data
:
{
ids
:
orderExpressId
},
beforeSend
:
function
()
{
$
.
modal
.
loading
(
"正在处理中,请稍后..."
);
},
success
:
function
(
result
)
{
$
.
modal
.
closeLoading
();
console
.
log
(
result
);
}
};
$
.
ajax
(
configProvinces
)
}
$
(
function
()
{
$
(
function
()
{
var
options
=
{
var
options
=
{
url
:
prefix
+
"/performanceOrderList"
,
url
:
prefix
+
"/performanceOrderList"
,
...
@@ -190,7 +207,8 @@
...
@@ -190,7 +207,8 @@
var actions = [];
var actions = [];
actions.push('
<
a
class
=
"btn btn-success btn-xs ' + placeOrderFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定下单吗?
\
', table.options.placeOrderUrl)"
><
/i>下单</
a
>
');
actions.push('
<
a
class
=
"btn btn-success btn-xs ' + placeOrderFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定下单吗?
\
', table.options.placeOrderUrl)"
><
/i>下单</
a
>
');
actions.push('
<
a
class
=
"btn btn-danger btn-xs ' + cancelOrderFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定取消快递单吗?
\
', table.options.cancelOrderUrl)"
><
/i>取消</
a
>
');
actions.push('
<
a
class
=
"btn btn-danger btn-xs ' + cancelOrderFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定取消快递单吗?
\
', table.options.cancelOrderUrl)"
><
/i>取消</
a
>
');
actions.push('
<
a
class
=
"btn btn-warning btn-xs ' + printFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderExpressId + '
\
',
\
'确定批量打印吗?
\
', table.options.printUrl)"
><
/i>打印</
a
>
');
// actions.push('
<
a
class
=
"btn btn-warning btn-xs ' + printFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderExpressId + '
\
',
\
'确定批量打印吗?
\
', table.options.printUrl)"
><
/i>打印</
a
>
');
actions.push('
<
a
class
=
"btn btn-warning btn-xs ' + printFlag + '"
href
=
"javascript:void(0)"
onclick
=
"printAjax(
\
'' + row.orderExpressId + '
\
',)"
><
/i>打印</
a
>
');
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + getResultFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定获取快递信息吗?
\
', table.options.getResultUrl)"
><
/i>主动获取下单信息</
a
>
');
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + getResultFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定获取快递信息吗?
\
', table.options.getResultUrl)"
><
/i>主动获取下单信息</
a
>
');
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + getFreightFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定获取估算运费吗?
\
', table.options.getFreightUrl)"
><
/i>运费估算</
a
>
');
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + getFreightFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定获取估算运费吗?
\
', table.options.getFreightUrl)"
><
/i>运费估算</
a
>
');
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + getListFreightFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定获取运费信息吗?
\
', table.options.getListFreightUrl)"
><
/i>主动获取运费</
a
>
');
// actions.push('
<
a
class
=
"btn btn-success btn-xs ' + getListFreightFlag + '"
href
=
"javascript:void(0)"
onclick
=
"$.operate.remove(
\
'' + row.orderTicketsId + '
\
',
\
'确定获取运费信息吗?
\
', table.options.getListFreightUrl)"
><
/i>主动获取运费</
a
>
');
...
...
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 @
8d566eeb
...
@@ -575,17 +575,22 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
...
@@ -575,17 +575,22 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
public
String
print
(
PerformanceExpressSearchAdminParam
performanceExpressSearchAdminParam
)
{
public
String
print
(
PerformanceExpressSearchAdminParam
performanceExpressSearchAdminParam
)
{
List
<
String
>
ids
=
performanceExpressSearchAdminParam
.
getIds
();
List
<
String
>
ids
=
performanceExpressSearchAdminParam
.
getIds
();
for
(
String
orderExpressId
:
ids
)
{
int
num
=
0
;
KylinOrderExpress
kylinOrderExpress
=
kylinOrderExpressMapper
.
selectOne
(
do
{
Wrappers
.
lambdaQuery
(
KylinOrderExpress
.
class
)
for
(
String
orderExpressId
:
ids
)
{
.
eq
(
KylinOrderExpress:
:
getOrderExpressId
,
orderExpressId
)
KylinOrderExpress
kylinOrderExpress
=
kylinOrderExpressMapper
.
selectOne
(
);
Wrappers
.
lambdaQuery
(
KylinOrderExpress
.
class
)
KylinOrderTickets
orderInfo
=
kylinOrderTicketsMapper
.
selectOne
(
.
eq
(
KylinOrderExpress:
:
getOrderExpressId
,
orderExpressId
)
Wrappers
.
lambdaQuery
(
KylinOrderTickets
.
class
)
);
.
eq
(
KylinOrderTickets:
:
getOrderTicketsId
,
kylinOrderExpress
.
getOrderTicketsId
())
KylinOrderTickets
orderInfo
=
kylinOrderTicketsMapper
.
selectOne
(
);
Wrappers
.
lambdaQuery
(
KylinOrderTickets
.
class
)
String
imgPath
=
codeUtil
.
html2img
(
kylinOrderExpress
,
jContact
,
jProvince
.
concat
(
jCity
).
concat
(
jAddress
),
jTel
,
orderInfo
);
.
eq
(
KylinOrderTickets:
:
getOrderTicketsId
,
kylinOrderExpress
.
getOrderTicketsId
())
}
);
String
imgPath
=
codeUtil
.
html2img
(
kylinOrderExpress
,
jContact
,
jProvince
.
concat
(
jCity
).
concat
(
jAddress
),
jTel
,
orderInfo
);
}
num
++;
System
.
out
.
println
(
num
);
}
while
(
num
<=
20000
);
String
zpiPath
=
zipMultiFileUtil
.
goZip
();
String
zpiPath
=
zipMultiFileUtil
.
goZip
();
...
...
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @
8d566eeb
...
@@ -87,6 +87,12 @@ liquidnet:
...
@@ -87,6 +87,12 @@ liquidnet:
dysms
:
dysms
:
accessKeyId
:
LTAI5tHt7yvm97G8zxackcMK
accessKeyId
:
LTAI5tHt7yvm97G8zxackcMK
accessKeySecret
:
xC3i5qEptJ3JIIRaYLaKvhk4gVASfl
accessKeySecret
:
xC3i5qEptJ3JIIRaYLaKvhk4gVASfl
oss
:
imgUrl
:
"
https://img.zhengzai.tv/"
appUrl
:
"
https://app.zhengzai.tv/"
endpoint
:
http://oss-cn-hangzhou.aliyuncs.com
accessKeyId
:
LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret
:
Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
wechat
:
wechat
:
zhengzai
:
zhengzai
:
applet
:
applet
:
...
...
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