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
c12569a6
Commit
c12569a6
authored
Aug 10, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加购物车新增originalProductType 用于存放商品的原始类型
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
6d252664
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
0 deletions
+27
-0
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java
+2
-0
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
+8
-0
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
+8
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
+8
-0
No files found.
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java
View file @
c12569a6
...
...
@@ -271,6 +271,8 @@ public class ShoppingCartAdapter {
return
;
}
ProductBeanDTO
spuProduct
=
firstProduct
.
get
();
// fisherman 添加原有商品服务的商品类型 -> 后续只为存表B端使用, 暂无其他地方有逻辑判断 20210810
cartGoods
.
setOriginalProductType
(
spuProduct
.
getType
());
//是否是sku商品
boolean
isSkuProduct
=
ObjectUtils
.
equals
(
GoodsTypeEnum
.
SKU_GOODS
.
getGoodsType
(),
cartGoods
.
getGoodsType
());
// 如果是套餐商品,更新套餐内固定商品&可选商品的详细信息
...
...
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
View file @
c12569a6
...
...
@@ -29,6 +29,14 @@ public class CartGoods {
private
String
cartGoodsUid
=
UUID
.
randomUUID
().
toString
();
/**
* 原有商品类型
*
* 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
* 该字段,保持和商品服务的商品类型一致
*/
private
Integer
originalProductType
;
/**
* 加车时间
*/
private
Long
addCartTime
;
...
...
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java
View file @
c12569a6
...
...
@@ -235,6 +235,7 @@ public interface ShoppingCartBaseService {
if
(
StringUtils
.
isEmpty
(
cartGoods
.
getGoodsId
())
||
Objects
.
equals
(
cartGoods
.
getGoodsType
(),
GoodsTypeEnum
.
COUPON_GOODS
.
getGoodsType
())
||
Objects
.
equals
(
cartGoods
.
getGoodsType
(),
GoodsTypeEnum
.
HG_COUPON_GOODS
.
getGoodsType
()))
{
continue
;
}
// fisherman 添加原有商品类型
shoppingCartAdapter
.
updateCartGoodsInfoNew
(
cartGoods
,
productList
);
}
//校验商品券是否有当前点餐方式
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
View file @
c12569a6
...
...
@@ -159,6 +159,14 @@ public class ShoppingCartGoodsDto {
private
String
originalGoodsUid
;
/**
* 原有商品类型
*
* 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
* 该字段,保持和商品服务的商品类型一致
*/
private
Integer
originalProductType
;
/**
* spuId
*/
private
String
spuId
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
View file @
c12569a6
...
...
@@ -31,6 +31,14 @@ public class CartGoods {
private
String
cartGoodsUid
=
UUID
.
randomUUID
().
toString
();
/**
* 原有商品类型
*
* 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
* 该字段,保持和商品服务的商品类型一致
*/
private
Integer
originalProductType
;
/**
* 买一赠一时,存赠送主商品的cartGoodsUid用于标记是哪个商品赠送的
*/
private
String
originalGoodsUid
;
...
...
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