Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QG
customer-service
Commits
a142b7cb
Commit
a142b7cb
authored
Mar 08, 2022
by
吴琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
0f5a8fa6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
1 deletion
+23
-1
TransactionReceiptRecordServiceImpl.java
...mer/service/impl/TransactionReceiptRecordServiceImpl.java
+23
-1
No files found.
src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java
View file @
a142b7cb
...
@@ -439,6 +439,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -439,6 +439,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
jsonResult
);
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
jsonResult
);
JSONArray
jsonArray
=
jsonObject
.
getJSONArray
(
"successList"
);
JSONArray
jsonArray
=
jsonObject
.
getJSONArray
(
"successList"
);
log
.
info
(
"contractUrl /contract/batch/sign jsonArray,"
+
jsonArray
);
List
<
String
>
updateSuccessList
=
new
ArrayList
<>();
List
<
String
>
updateSuccessList
=
new
ArrayList
<>();
if
(
jsonArray
!=
null
&&
jsonArray
.
size
()>
0
){
if
(
jsonArray
!=
null
&&
jsonArray
.
size
()>
0
){
for
(
int
i
=
0
;
i
<
jsonArray
.
size
()
;
i
++){
for
(
int
i
=
0
;
i
<
jsonArray
.
size
()
;
i
++){
...
@@ -464,8 +465,10 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -464,8 +465,10 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
deleteRedis
(
"exportZipFile"
);
deleteRedis
(
"exportZipFile"
);
throw
new
RuntimeException
(
"签章失败!"
);
throw
new
RuntimeException
(
"签章失败!"
);
}
}
log
.
info
(
"contractUrl /contract/batch/sign updateSuccessList,"
+
updateSuccessList
);
//更新数据
//更新数据
JSONArray
failList
=
jsonObject
.
getJSONArray
(
"failList"
);
JSONArray
failList
=
jsonObject
.
getJSONArray
(
"failList"
);
log
.
info
(
"contractUrl /contract/batch/sign jsonArray,"
+
failList
);
List
<
String
>
updateFailList
=
new
ArrayList
<>();
List
<
String
>
updateFailList
=
new
ArrayList
<>();
if
(
failList
!=
null
&&
failList
.
size
()>
0
){
if
(
failList
!=
null
&&
failList
.
size
()>
0
){
for
(
int
i
=
0
;
i
<
jsonArray
.
size
()
;
i
++){
for
(
int
i
=
0
;
i
<
jsonArray
.
size
()
;
i
++){
...
@@ -476,8 +479,9 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -476,8 +479,9 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
updateFailList
.
add
(
path
);
updateFailList
.
add
(
path
);
}
}
}
}
log
.
info
(
"contractUrl /contract/batch/sign updateFailList,"
+
updateFailList
);
//更新导出状态
//更新导出状态
log
.
info
(
"交易凭证导出接口更新导出状态 begin"
,
updateSuccessList
,
updateFailList
);
log
.
info
(
"交易凭证导出接口更新导出状态 begin"
);
updatePDFSignStatus
(
updateSuccessList
,
updateFailList
);
updatePDFSignStatus
(
updateSuccessList
,
updateFailList
);
log
.
info
(
"交易凭证导出接口更新导出状态 end"
);
log
.
info
(
"交易凭证导出接口更新导出状态 end"
);
File
file
=
ZipUtil
.
zip
(
downloadLocalPath
,
downloadLocalPath
+
".zip"
);
//zip 包保存路径
File
file
=
ZipUtil
.
zip
(
downloadLocalPath
,
downloadLocalPath
+
".zip"
);
//zip 包保存路径
...
@@ -684,6 +688,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -684,6 +688,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
* @param failList
* @param failList
*/
*/
public
void
updatePDFSignStatus
(
List
<
String
>
successList
,
List
<
String
>
failList
)
{
public
void
updatePDFSignStatus
(
List
<
String
>
successList
,
List
<
String
>
failList
)
{
log
.
info
(
"contractUrl /contract/batch/sign successList,"
+
successList
);
//pdf签章成功
//pdf签章成功
if
(!
successList
.
isEmpty
()){
if
(!
successList
.
isEmpty
()){
for
(
String
orderNo
:
successList
){
for
(
String
orderNo
:
successList
){
...
@@ -697,6 +702,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -697,6 +702,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
}
}
}
}
}
}
log
.
info
(
"contractUrl /contract/batch/sign failList,"
+
failList
);
//pdf签章失败
//pdf签章失败
if
(!
failList
.
isEmpty
()){
if
(!
failList
.
isEmpty
()){
for
(
String
orderNo
:
failList
){
for
(
String
orderNo
:
failList
){
...
@@ -838,6 +844,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -838,6 +844,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
cell
.
setColspan
(
6
);
cell
.
setColspan
(
6
);
cell
.
setMinimumHeight
(
18
);
cell
.
setMinimumHeight
(
18
);
table
.
addCell
(
cell
);
table
.
addCell
(
cell
);
if
(
logisticsVOList
.
size
()>
0
){
if
(
logisticsVOList
.
size
()>
0
){
//第一行标题
//第一行标题
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"发货时间"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"发货时间"
),
font
));
...
@@ -855,6 +862,21 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
...
@@ -855,6 +862,21 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
StringUtils
.
isEmpty
(
logisticsVO
.
getTypeName
())?
"/"
:
logisticsVO
.
getTypeName
()),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
StringUtils
.
isEmpty
(
logisticsVO
.
getTypeName
())?
"/"
:
logisticsVO
.
getTypeName
()),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
StringUtils
.
isEmpty
(
logisticsVO
.
getExpressCompany
())?
"/"
:
logisticsVO
.
getExpressCompany
()),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
StringUtils
.
isEmpty
(
logisticsVO
.
getExpressCompany
())?
"/"
:
logisticsVO
.
getExpressCompany
()),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
StringUtils
.
isEmpty
(
logisticsVO
.
getDeliveryNo
())?
"/"
:
logisticsVO
.
getDeliveryNo
()),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
StringUtils
.
isEmpty
(
logisticsVO
.
getDeliveryNo
())?
"/"
:
logisticsVO
.
getDeliveryNo
()),
font
));
}
else
{
//第一行标题
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"发货时间"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"确认收货时间"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"订单状态"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"订单类型"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"物流公司"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"物流单号"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"/"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"/"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"/"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"/"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"/"
),
font
));
table
.
addCell
(
new
Phrase
(
ITextPDFUtil
.
getUTF8String
(
"/"
),
font
));
}
}
//商品信息
//商品信息
...
...
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