Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center
Commits
ebea03c6
Commit
ebea03c6
authored
Aug 31, 2021
by
陈浩建
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
融合办理-下单参数变化-》payType 剔除“元”,纯数字
parent
d7f569d3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
+6
-1
No files found.
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
View file @
ebea03c6
...
@@ -537,6 +537,7 @@ public class IntelligenceSendOrder {
...
@@ -537,6 +537,7 @@ public class IntelligenceSendOrder {
Map
<
String
,
String
>
paymentMap
=
new
HashMap
<
String
,
String
>();
Map
<
String
,
String
>
paymentMap
=
new
HashMap
<
String
,
String
>();
paymentMap
.
put
(
"id"
,
saleId
);
// 收费项ID,必填;请通过销售品列表接口获取
paymentMap
.
put
(
"id"
,
saleId
);
// 收费项ID,必填;请通过销售品列表接口获取
paymentMap
.
put
(
"payAmount"
,
ORDERAMOUNT
);
// 缴费金额(打款金额),缴费方式为“代理商打款”或“穗易付”时必填
paymentMap
.
put
(
"payAmount"
,
ORDERAMOUNT
);
// 缴费金额(打款金额),缴费方式为“代理商打款”或“穗易付”时必填
ORDERAMOUNT
=
ORDERAMOUNT
.
replace
(
"元"
,
""
);
if
(
ORDERAMOUNT
.
equals
(
"0.01"
)
||
ORDERAMOUNT
.
equals
(
"0.02"
))
{
if
(
ORDERAMOUNT
.
equals
(
"0.01"
)
||
ORDERAMOUNT
.
equals
(
"0.02"
))
{
paymentMap
.
put
(
"payType"
,
"2"
);
paymentMap
.
put
(
"payType"
,
"2"
);
}
else
{
}
else
{
...
@@ -878,11 +879,12 @@ public class IntelligenceSendOrder {
...
@@ -878,11 +879,12 @@ public class IntelligenceSendOrder {
*/
*/
public
void
integrateSendOrder
(
Order
order
,
boolean
rightNowSend
)
throws
Exception
{
public
void
integrateSendOrder
(
Order
order
,
boolean
rightNowSend
)
throws
Exception
{
if
(
order
==
null
)
{
if
(
order
==
null
)
{
log
.
info
(
"融合下单数据为空!"
);
log
.
info
(
"融合下单数据为空!"
);
return
;
return
;
}
}
log
.
info
(
"融合办理前置调用:"
+
order
.
toString
());
if
(!
rightNowSend
)
{
if
(!
rightNowSend
)
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
Date
rhTime
=
null
;
Date
rhTime
=
null
;
...
@@ -966,6 +968,7 @@ public class IntelligenceSendOrder {
...
@@ -966,6 +968,7 @@ public class IntelligenceSendOrder {
setPriceIndex
(
schoolMap
,
orderMap
,
ORDERAMOUNT
);
setPriceIndex
(
schoolMap
,
orderMap
,
ORDERAMOUNT
);
String
ORDERREQTRANSEQ
=
""
;
String
ORDERREQTRANSEQ
=
""
;
if
(
orderMap
.
get
(
"orderReqtranSeq"
)
!=
null
)
{
if
(
orderMap
.
get
(
"orderReqtranSeq"
)
!=
null
)
{
ORDERREQTRANSEQ
=
orderMap
.
get
(
"orderReqtranSeq"
).
toString
();
// 穗易付订单号
ORDERREQTRANSEQ
=
orderMap
.
get
(
"orderReqtranSeq"
).
toString
();
// 穗易付订单号
...
@@ -1299,6 +1302,7 @@ public class IntelligenceSendOrder {
...
@@ -1299,6 +1302,7 @@ public class IntelligenceSendOrder {
Map
<
String
,
Object
>
paymentListMap2
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paymentListMap2
=
new
HashMap
<
String
,
Object
>();
paymentListMap2
.
put
(
"id"
,
saleId1
);
// 收费项ID,选填;请通过销售品列表接口获取,若不填表示终端补收款
paymentListMap2
.
put
(
"id"
,
saleId1
);
// 收费项ID,选填;请通过销售品列表接口获取,若不填表示终端补收款
paymentListMap2
.
put
(
"saleName"
,
""
);
// 销售品名称,选填,若id不填写此项必填写,且只能为终端补收款
paymentListMap2
.
put
(
"saleName"
,
""
);
// 销售品名称,选填,若id不填写此项必填写,且只能为终端补收款
ORDERAMOUNT
=
ORDERAMOUNT
.
replace
(
"元"
,
""
);
paymentListMap2
.
put
(
"payAmount"
,
ORDERAMOUNT
);
// 打款金额(支付金额),若选择代理商打款、者穗易付、货到付款,此项必填
paymentListMap2
.
put
(
"payAmount"
,
ORDERAMOUNT
);
// 打款金额(支付金额),若选择代理商打款、者穗易付、货到付款,此项必填
if
(
orderMap
.
get
(
"webOrderAmount"
).
toString
().
equals
(
"0"
)
if
(
orderMap
.
get
(
"webOrderAmount"
).
toString
().
equals
(
"0"
)
...
@@ -1457,6 +1461,7 @@ public class IntelligenceSendOrder {
...
@@ -1457,6 +1461,7 @@ public class IntelligenceSendOrder {
productMap
.
put
(
"addProperties"
,
addPropertyList
);
productMap
.
put
(
"addProperties"
,
addPropertyList
);
productList
.
add
(
productMap
);
productList
.
add
(
productMap
);
log
.
info
(
"productList.toString():"
+
productList
.
toString
());
// 将对象装换为json字符串
// 将对象装换为json字符串
String
productJson
=
net
.
sf
.
json
.
JSONArray
.
fromObject
(
productList
).
toString
();
String
productJson
=
net
.
sf
.
json
.
JSONArray
.
fromObject
(
productList
).
toString
();
...
...
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