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
order-group-application
order-group
Commits
947e1e7f
Commit
947e1e7f
authored
Oct 14, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/2020/09/07-1.9.38-优惠信息入库-张志恒'
parents
b62de01f
1bf1413b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
947e1e7f
...
...
@@ -801,7 +801,8 @@ public class OrderSdkAdapter {
}
accountBean
.
setSequence
(
orderSettlementResp
.
getProductSeq
());
accountBean
.
setType
(
getOldOrderAccountType
(
orderSettlementResp
.
getSettlementType
()));
accountBean
.
setAddInfo
(
""
);
// accountBean.setAddInfo("");
accountBean
.
setAddInfo
(
orderSettlementResp
.
getExtInfo
());
accountBean
.
setPlatformDiscountAmount
(
orderSettlementResp
.
getPlatformDiscountAmount
());
accountBean
.
setShopDiscountAmount
(
orderSettlementResp
.
getShopDiscountAmount
());
accountList
.
add
(
accountBean
);
...
...
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