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
962dab91
Commit
962dab91
authored
Mar 13, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加加车时间
parent
4f37b438
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
0 deletions
+9
-0
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountRequestDto.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+3
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
View file @
962dab91
...
@@ -409,6 +409,7 @@ public class ShoppingCartConvertAdapter {
...
@@ -409,6 +409,7 @@ public class ShoppingCartConvertAdapter {
Integer
qty
=
addShoppingCartGoodsRequestVo
.
getQty
()
==
null
?
1
:
addShoppingCartGoodsRequestVo
.
getQty
();
Integer
qty
=
addShoppingCartGoodsRequestVo
.
getQty
()
==
null
?
1
:
addShoppingCartGoodsRequestVo
.
getQty
();
CartGoods
cartGoods
=
new
CartGoods
();
CartGoods
cartGoods
=
new
CartGoods
();
cartGoods
.
setGoodsId
(
goodsId
);
cartGoods
.
setGoodsId
(
goodsId
);
cartGoods
.
setAddCartTime
(
System
.
currentTimeMillis
());
cartGoods
.
setSpuId
(
spuId
);
cartGoods
.
setSpuId
(
spuId
);
cartGoods
.
setSkuId
(
skuId
);
cartGoods
.
setSkuId
(
skuId
);
cartGoods
.
setQty
(
qty
);
cartGoods
.
setQty
(
qty
);
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountRequestDto.java
View file @
962dab91
...
@@ -119,6 +119,10 @@ public class CalculationSharingDiscountRequestDto {
...
@@ -119,6 +119,10 @@ public class CalculationSharingDiscountRequestDto {
*/
*/
private
Long
originalPrice
;
private
Long
originalPrice
;
/**
/**
* 加车时间
*/
private
Long
addCartTime
;
/**
* 折扣比例
* 折扣比例
* 例如8折为80
* 例如8折为80
*/
*/
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
962dab91
...
@@ -1349,6 +1349,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -1349,6 +1349,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
calculationDiscountGoods
.
setGoodsId
(
cartGoods
.
getGoodsId
());
calculationDiscountGoods
.
setGoodsId
(
cartGoods
.
getGoodsId
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setAddCartTime
(
cartGoods
.
getAddCartTime
()
==
null
?
0
:
cartGoods
.
getAddCartTime
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setOriginalPrice
(
cartGoods
.
getFinalPrice
());
calculationDiscountGoods
.
setOriginalPrice
(
cartGoods
.
getFinalPrice
());
calculationDiscountGoods
.
setMemberDiscount
(
cartGoods
.
getMemberDiscount
());
calculationDiscountGoods
.
setMemberDiscount
(
cartGoods
.
getMemberDiscount
());
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
962dab91
...
@@ -263,6 +263,7 @@ public class CalculationSharingDiscountService {
...
@@ -263,6 +263,7 @@ public class CalculationSharingDiscountService {
calculationDiscountGoods
.
setGoodsId
(
cartGoods
.
getGoodsId
());
calculationDiscountGoods
.
setGoodsId
(
cartGoods
.
getGoodsId
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setAddCartTime
(
cartGoods
.
getAddCartTime
()
==
null
?
0
:
cartGoods
.
getAddCartTime
());
//if (cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS))
//if (cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS))
if
(
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProductGroupList
())
||
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProductComboList
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProductGroupList
())
||
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProductComboList
()))
{
calculationDiscountGoods
.
setOriginalPrice
(
cartGoods
.
getFinalPrice
()!=
null
?
cartGoods
.
getFinalPrice
()
:
cartGoods
.
getOriginalPrice
());
calculationDiscountGoods
.
setOriginalPrice
(
cartGoods
.
getFinalPrice
()!=
null
?
cartGoods
.
getFinalPrice
()
:
cartGoods
.
getOriginalPrice
());
...
@@ -329,6 +330,7 @@ public class CalculationSharingDiscountService {
...
@@ -329,6 +330,7 @@ public class CalculationSharingDiscountService {
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
calculationDiscountGoods
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
();
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
calculationDiscountGoods
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
();
calculationDiscountGoods
.
setGoodsId
(
goodsId
);
calculationDiscountGoods
.
setGoodsId
(
goodsId
);
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setAddCartTime
(
cartGoods
.
getAddCartTime
()
==
null
?
0
:
cartGoods
.
getAddCartTime
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setOriginalPrice
(
originalPrice
);
calculationDiscountGoods
.
setOriginalPrice
(
originalPrice
);
calculationDiscountGoods
.
setMemberDiscount
(
100
);
calculationDiscountGoods
.
setMemberDiscount
(
100
);
...
@@ -342,6 +344,7 @@ public class CalculationSharingDiscountService {
...
@@ -342,6 +344,7 @@ public class CalculationSharingDiscountService {
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
calculationDiscountGoods
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
();
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
calculationDiscountGoods
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
();
calculationDiscountGoods
.
setGoodsId
(
goodsId
);
calculationDiscountGoods
.
setGoodsId
(
goodsId
);
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setAddCartTime
(
cartGoods
.
getAddCartTime
()
==
null
?
0
:
cartGoods
.
getAddCartTime
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
calculationDiscountGoods
.
setOriginalPrice
(
originalPrice
);
calculationDiscountGoods
.
setOriginalPrice
(
originalPrice
);
calculationDiscountGoods
.
setMemberDiscount
(
100
);
calculationDiscountGoods
.
setMemberDiscount
(
100
);
...
...
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