Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
jenkins
order-group
Commits
1c7d05c3
Commit
1c7d05c3
authored
Dec 20, 2019
by
张明警
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
桂源铺 - 金额问题
parent
01e01e0a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
platform-sdk/src/main/java/cn/freemud/platform/sdk/hualala/HualalaSdkService.java
+2
-2
push-order-service/src/main/java/cn/freemud/service/SynchronizedOrderHualalaServiceImpl.java
+1
-6
No files found.
platform-sdk/src/main/java/cn/freemud/platform/sdk/hualala/HualalaSdkService.java
View file @
1c7d05c3
...
@@ -55,10 +55,10 @@ public class HualalaSdkService {
...
@@ -55,10 +55,10 @@ public class HualalaSdkService {
String
body
=
getRequestBodyStr
(
finalRequest
,
baseConfig
.
getMerchantSecret
());
String
body
=
getRequestBodyStr
(
finalRequest
,
baseConfig
.
getMerchantSecret
());
requestHeader
.
setRequestBody
(
body
);
requestHeader
.
setRequestBody
(
body
);
requestHeader
.
setSignature
(
sign
);
requestHeader
.
setSignature
(
sign
);
logger
.
info
(
"
requestBody:
{} trackingNo:{},orderCode:{},requestHeader:{}"
,
logger
.
info
(
"
桂源铺推送哗啦啦请求体:
{} trackingNo:{},orderCode:{},requestHeader:{}"
,
JSONObject
.
toJSONString
(
finalRequest
),
trackingNo
,
requestBody
.
getThirdOrderID
(),
JSONObject
.
toJSONString
(
requestHeader
));
JSONObject
.
toJSONString
(
finalRequest
),
trackingNo
,
requestBody
.
getThirdOrderID
(),
JSONObject
.
toJSONString
(
requestHeader
));
SubmitOrderNewResponse
submitOrderNewResponse
=
cloudService
.
doSend
(
trackingNo
,
"https://www-openapi.hualala.com/order/submitordernew"
,
requestHeader
,
SubmitOrderNewResponse
.
class
);
SubmitOrderNewResponse
submitOrderNewResponse
=
cloudService
.
doSend
(
trackingNo
,
"https://www-openapi.hualala.com/order/submitordernew"
,
requestHeader
,
SubmitOrderNewResponse
.
class
);
logger
.
info
(
"
response:
{} trackingNo:{},orderCode:{}"
,
JSONObject
.
toJSONString
(
submitOrderNewResponse
),
trackingNo
,
requestBody
.
getThirdOrderID
());
logger
.
info
(
"
桂源铺推送哗啦啦响应体:
{} trackingNo:{},orderCode:{}"
,
JSONObject
.
toJSONString
(
submitOrderNewResponse
),
trackingNo
,
requestBody
.
getThirdOrderID
());
return
submitOrderNewResponse
;
return
submitOrderNewResponse
;
}
}
...
...
push-order-service/src/main/java/cn/freemud/service/SynchronizedOrderHualalaServiceImpl.java
View file @
1c7d05c3
...
@@ -264,12 +264,7 @@ public class SynchronizedOrderHualalaServiceImpl implements SynchronizedOrderSer
...
@@ -264,12 +264,7 @@ public class SynchronizedOrderHualalaServiceImpl implements SynchronizedOrderSer
OrderBody
.
OrderBean
orderBean
=
orderBody
.
getOrderBean
();
OrderBody
.
OrderBean
orderBean
=
orderBody
.
getOrderBean
();
List
<
PaymentDetailVo
>
paymentDetailVos
=
new
ArrayList
<>();
List
<
PaymentDetailVo
>
paymentDetailVos
=
new
ArrayList
<>();
PaymentDetailVo
paymentDetailVo
=
new
PaymentDetailVo
();
PaymentDetailVo
paymentDetailVo
=
new
PaymentDetailVo
();
/**
paymentDetailVo
.
setDueAmount
(
getPointsConvertToYuan
(
orderBean
.
getAmount
())
+
""
);
* 高能预警,此处有坑,以后切到适配层的话,这里需要特殊处理
*/
if
(
null
!=
orderBean
.
getOriginalAmount
()){
paymentDetailVo
.
setDueAmount
(
getBigDecimalPointsConvertToYuan
(
orderBean
.
getOriginalAmount
()));
}
/**
/**
* 参照OrderStatusEnum 会员卡支付需要回写支付状态 15未支付20已支付
* 参照OrderStatusEnum 会员卡支付需要回写支付状态 15未支付20已支付
*/
*/
...
...
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