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
26198180
Commit
26198180
authored
Jul 30, 2020
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加料商品开发
parent
848c516f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+5
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
26198180
...
@@ -2563,7 +2563,11 @@ public class OrderSdkAdapter {
...
@@ -2563,7 +2563,11 @@ public class OrderSdkAdapter {
for
(
CreateOrderProductRequest
productRequest
:
products
)
{
for
(
CreateOrderProductRequest
productRequest
:
products
)
{
// 普通商品 订单转换
// 普通商品 订单转换
productRequest
.
setOpid
(
index
);
productRequest
.
setOpid
(
index
);
originalAmount
+=
updateOrderItemAndSettlement
(
orderItemList
,
orderSettlementCreateReqList
,
productRequest
,
partnerId
,
""
);
if
(
ProductTypeEnum
.
MATERIAL_PRODUCT
.
getCode
().
equals
(
productRequest
.
getProductType
()))
{
originalAmount
+=
updateOrderItemAndSettlement
(
orderItemList
,
orderSettlementCreateReqList
,
productRequest
,
partnerId
,
productRequest
.
getParentProductId
());
}
else
{
originalAmount
+=
updateOrderItemAndSettlement
(
orderItemList
,
orderSettlementCreateReqList
,
productRequest
,
partnerId
,
""
);
}
// 如果是套餐商品,需要转换当前商品行子集ComboProduct&GroupProduct(固定商品、可选商品)
// 如果是套餐商品,需要转换当前商品行子集ComboProduct&GroupProduct(固定商品、可选商品)
if
(
ObjectUtils
.
equals
(
ProductTypeEnum
.
SETMEAL_PRODUCT
.
getCode
(),
productRequest
.
getProductType
())
||
ObjectUtils
.
equals
(
ProductTypeEnum
.
SETMEAL_UPPRICE_PRODUCT
.
getCode
(),
productRequest
.
getProductType
()))
{
if
(
ObjectUtils
.
equals
(
ProductTypeEnum
.
SETMEAL_PRODUCT
.
getCode
(),
productRequest
.
getProductType
())
||
ObjectUtils
.
equals
(
ProductTypeEnum
.
SETMEAL_UPPRICE_PRODUCT
.
getCode
(),
productRequest
.
getProductType
()))
{
// 父类商品productId=productId+seq
// 父类商品productId=productId+seq
...
...
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