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
6faf45a4
Commit
6faf45a4
authored
Feb 01, 2021
by
刘鹏飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新版促销增加小料数量入参
parent
8dd3328a
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
1 deletions
+18
-1
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
+5
-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/vo/CartGoods.java
+6
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/MaterialRequestVo.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+1
-1
No files found.
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
View file @
6faf45a4
...
@@ -444,5 +444,10 @@ public class CartGoods {
...
@@ -444,5 +444,10 @@ public class CartGoods {
* 麦咖啡入机键位
* 麦咖啡入机键位
*/
*/
private
String
customerCode
;
private
String
customerCode
;
/**
* 数量
*/
private
Integer
qty
;
}
}
}
}
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
View file @
6faf45a4
...
@@ -454,6 +454,7 @@ public class ShoppingCartConvertAdapter {
...
@@ -454,6 +454,7 @@ public class ShoppingCartConvertAdapter {
for
(
MaterialRequestVo
materialRequestVo
:
addShoppingCartGoodsRequestVo
.
getProductMaterialList
())
{
for
(
MaterialRequestVo
materialRequestVo
:
addShoppingCartGoodsRequestVo
.
getProductMaterialList
())
{
CartGoods
.
MaterialGoods
materialGoods
=
new
CartGoods
.
MaterialGoods
();
CartGoods
.
MaterialGoods
materialGoods
=
new
CartGoods
.
MaterialGoods
();
materialGoods
.
setSpuId
(
materialRequestVo
.
getSpuId
());
materialGoods
.
setSpuId
(
materialRequestVo
.
getSpuId
());
materialGoods
.
setQty
(
materialRequestVo
.
getQty
()
==
null
?
1
:
materialRequestVo
.
getQty
());
materialGoodsList
.
add
(
materialGoods
);
materialGoodsList
.
add
(
materialGoods
);
}
}
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
View file @
6faf45a4
...
@@ -267,6 +267,7 @@ public class CartGoods {
...
@@ -267,6 +267,7 @@ public class CartGoods {
* 属性名
* 属性名
*/
*/
private
String
attributeName
;
private
String
attributeName
;
}
}
@Data
@Data
...
@@ -569,5 +570,10 @@ public class CartGoods {
...
@@ -569,5 +570,10 @@ public class CartGoods {
* 麦咖啡入机键位
* 麦咖啡入机键位
*/
*/
private
String
customerCode
;
private
String
customerCode
;
/**
* 数量
*/
private
Integer
qty
;
}
}
}
}
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/MaterialRequestVo.java
View file @
6faf45a4
...
@@ -26,6 +26,11 @@ public class MaterialRequestVo {
...
@@ -26,6 +26,11 @@ public class MaterialRequestVo {
private
String
groupId
;
private
String
groupId
;
/**
/**
* 数量
*/
private
Integer
qty
;
/**
* 麦咖啡入机键位
* 麦咖啡入机键位
*/
*/
private
String
customerCode
;
private
String
customerCode
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
6faf45a4
...
@@ -253,7 +253,7 @@ public class CalculationSharingDiscountService {
...
@@ -253,7 +253,7 @@ public class CalculationSharingDiscountService {
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
.
Material
material
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
.
Material
();
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
.
Material
material
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
.
Material
();
material
.
setType
(
1
);
material
.
setType
(
1
);
material
.
setGoodsId
(
materialGoods
.
getSpuId
());
material
.
setGoodsId
(
materialGoods
.
getSpuId
());
material
.
setGoodsQuantity
(
1
);
material
.
setGoodsQuantity
(
materialGoods
.
getQty
()
);
material
.
setOriginalPrice
(
materialGoods
.
getFinalPrice
());
material
.
setOriginalPrice
(
materialGoods
.
getFinalPrice
());
materials
.
add
(
material
);
materials
.
add
(
material
);
}
}
...
...
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