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
b7630bce
Commit
b7630bce
authored
Jan 15, 2021
by
yu.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::new function about p5v2
parent
baa6fe2c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
2 deletions
+40
-2
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
+29
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
+5
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java
+5
-1
No files found.
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
View file @
b7630bce
...
@@ -79,6 +79,18 @@ public class CartGoods {
...
@@ -79,6 +79,18 @@ public class CartGoods {
*/
*/
private
String
couponCode
;
private
String
couponCode
;
/**
/**
* 是否是月享卡商品
*/
private
int
isMonthCard
;
/**
* 是否为种子券商品 1:是;0:否
*/
private
int
isSeedCouponGoods
;
/**
* 月享卡信息
*/
private
MonthCardVo
monthCardInfo
;
/**
* 商品券名称
* 商品券名称
*/
*/
private
String
couponName
;
private
String
couponName
;
...
@@ -253,6 +265,23 @@ public class CartGoods {
...
@@ -253,6 +265,23 @@ public class CartGoods {
}
}
@Data
@Data
@NoArgsConstructor
public
class
MonthCardVo
{
/**
* 卡号
*/
private
String
cardNo
;
/**
* 券号
*/
private
String
cardCode
;
/**
* 月享卡类型:1.月享卡(单商品购买);2.月享卡(多商品购买);3.普通月卡
*/
private
Integer
type
;
}
@Data
public
final
static
class
ComboxGoods
{
public
final
static
class
ComboxGoods
{
/**
/**
* 单规格spuId,多规格skuId
* 单规格spuId,多规格skuId
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
View file @
b7630bce
...
@@ -202,7 +202,11 @@ public class CartGoods {
...
@@ -202,7 +202,11 @@ public class CartGoods {
/**
/**
* 是否是月享卡商品
* 是否是月享卡商品
*/
*/
private
int
isMonthCard
=
0
;
private
int
isMonthCard
;
/**
* 是否为种子券商品 1:是;0:否
*/
private
int
isSeedCouponGoods
;
/**
/**
* 月享卡信息
* 月享卡信息
*/
*/
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
b7630bce
...
@@ -1448,6 +1448,7 @@ public class ShoppingCartMCoffeeServiceImpl {
...
@@ -1448,6 +1448,7 @@ public class ShoppingCartMCoffeeServiceImpl {
cartGoods
.
setSkuId
(
skuId
);
cartGoods
.
setSkuId
(
skuId
);
cartGoods
.
setQty
(
qty
);
cartGoods
.
setQty
(
qty
);
cartGoods
.
setIsMonthCard
(
addShoppingCartGoodsRequestVo
.
getIsMonthCard
());
cartGoods
.
setIsMonthCard
(
addShoppingCartGoodsRequestVo
.
getIsMonthCard
());
cartGoods
.
setIsSeedCouponGoods
(
addShoppingCartGoodsRequestVo
.
getIsSeedCouponGoods
());
cartGoods
.
setCouponCode
(
addShoppingCartGoodsRequestVo
.
getCouponCode
());
cartGoods
.
setCouponCode
(
addShoppingCartGoodsRequestVo
.
getCouponCode
());
Integer
goodsType
=
StringUtils
.
isEmpty
(
skuId
)
||
ObjectUtils
.
equals
(
spuId
,
skuId
)
?
GoodsTypeEnum
.
SPU_GOODS
.
getGoodsType
()
:
GoodsTypeEnum
.
SKU_GOODS
.
getGoodsType
();
Integer
goodsType
=
StringUtils
.
isEmpty
(
skuId
)
||
ObjectUtils
.
equals
(
spuId
,
skuId
)
?
GoodsTypeEnum
.
SPU_GOODS
.
getGoodsType
()
:
GoodsTypeEnum
.
SKU_GOODS
.
getGoodsType
();
if
(
spuId
.
startsWith
(
CommonsConstant
.
COUPON_PREFIX
))
{
if
(
spuId
.
startsWith
(
CommonsConstant
.
COUPON_PREFIX
))
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java
View file @
b7630bce
...
@@ -133,7 +133,11 @@ public class MCoffeeAddGoodsRequestVo {
...
@@ -133,7 +133,11 @@ public class MCoffeeAddGoodsRequestVo {
/**
/**
* 当前商品是否为月享卡,0:否,1:是
* 当前商品是否为月享卡,0:否,1:是
*/
*/
private
int
isMonthCard
=
0
;
private
int
isMonthCard
;
/**
* 是否为种子券商品 1:是;0:否
*/
private
int
isSeedCouponGoods
;
/**
/**
* 月享卡加购信息
* 月享卡加购信息
*/
*/
...
...
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