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
baa78459
Commit
baa78459
authored
Aug 31, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设置小料商品类型
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
52fd1718
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
+2
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
View file @
baa78459
...
@@ -407,6 +407,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
...
@@ -407,6 +407,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
cartGoodsDetailDtos
.
addAll
(
shoppingCartConvertAdapter
.
getComboxGoods2DetailGoods
(
eachGoods
,
eachGoods
.
getProductComboList
(),
true
,
totalDiscountAmount
));
cartGoodsDetailDtos
.
addAll
(
shoppingCartConvertAdapter
.
getComboxGoods2DetailGoods
(
eachGoods
,
eachGoods
.
getProductComboList
(),
true
,
totalDiscountAmount
));
cartGoodsDetailDtos
.
addAll
(
shoppingCartConvertAdapter
.
getComboxGoods2DetailGoods
(
eachGoods
,
eachGoods
.
getProductGroupList
(),
false
,
0
));
cartGoodsDetailDtos
.
addAll
(
shoppingCartConvertAdapter
.
getComboxGoods2DetailGoods
(
eachGoods
,
eachGoods
.
getProductGroupList
(),
false
,
0
));
cartGoodsDetailDto
.
setComboProducts
(
cartGoodsDetailDtos
);
cartGoodsDetailDto
.
setComboProducts
(
cartGoodsDetailDtos
);
cartGoodsDetailDto
.
setOriginalProductType
(
eachGoods
.
getOriginalProductType
());
products
.
add
(
cartGoodsDetailDto
);
products
.
add
(
cartGoodsDetailDto
);
});
});
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
View file @
baa78459
...
@@ -16,8 +16,6 @@ import cn.freemud.enums.*;
...
@@ -16,8 +16,6 @@ import cn.freemud.enums.*;
import
cn.freemud.handle.CommonFunctionHandle
;
import
cn.freemud.handle.CommonFunctionHandle
;
import
cn.freemud.service.thirdparty.CustomerApplicationClient
;
import
cn.freemud.service.thirdparty.CustomerApplicationClient
;
import
cn.freemud.utils.BeanUtil
;
import
cn.freemud.utils.BeanUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
ma.glasnost.orika.MapperFacade
;
import
ma.glasnost.orika.MapperFacade
;
...
@@ -392,6 +390,8 @@ public class CalculationCommonService {
...
@@ -392,6 +390,8 @@ public class CalculationCommonService {
ShoppingCartGoodsDto
.
CartGoodsDetailDto
cartGoodsDetailDto
=
new
ShoppingCartGoodsDto
.
CartGoodsDetailDto
();
ShoppingCartGoodsDto
.
CartGoodsDetailDto
cartGoodsDetailDto
=
new
ShoppingCartGoodsDto
.
CartGoodsDetailDto
();
cartGoodsDetailDto
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
cartGoodsDetailDto
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
// fisherman
cartGoodsDetailDto
.
setOriginalProductType
(
cartGoods
.
getOriginalProductType
());
cartGoodsDetailDto
.
setTaxId
(
cartGoods
.
getTaxId
());
cartGoodsDetailDto
.
setTaxId
(
cartGoods
.
getTaxId
());
cartGoodsDetailDto
.
setTax
(
cartGoods
.
getTax
());
cartGoodsDetailDto
.
setTax
(
cartGoods
.
getTax
());
cartGoodsDetailDto
.
setSpuId
(
cartGoods
.
getSpuId
());
cartGoodsDetailDto
.
setSpuId
(
cartGoods
.
getSpuId
());
...
...
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