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
0eb8839f
Commit
0eb8839f
authored
Jun 12, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:买赠
parent
98463191
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
+2
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
+4
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
View file @
0eb8839f
...
@@ -323,6 +323,8 @@ public class ShoppingCartConvertAdapter {
...
@@ -323,6 +323,8 @@ public class ShoppingCartConvertAdapter {
cartGoods
.
setCreateTimeMili
(
cartGood
.
getCreateTimeMili
());
cartGoods
.
setCreateTimeMili
(
cartGood
.
getCreateTimeMili
());
cartGoods
.
setSkuName
(
cartGood
.
getSkuName
());
cartGoods
.
setSkuName
(
cartGood
.
getSkuName
());
cartGoods
.
setSkuName
(
cartGood
.
getSkuName
());
cartGoods
.
setSkuName
(
cartGood
.
getSkuName
());
cartGood
.
setClassificationId
(
cartGood
.
getClassificationId
());
cartGood
.
setClassificationName
(
cartGood
.
getClassificationName
());
cartGoods
.
setActivityType
(
ActivityTypeEnum
.
TYPE_61
.
getCode
());
cartGoods
.
setActivityType
(
ActivityTypeEnum
.
TYPE_61
.
getCode
());
return
cartGoods
;
return
cartGoods
;
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
View file @
0eb8839f
...
@@ -222,6 +222,8 @@ public class BuySendPromotionService implements IPromotionService {
...
@@ -222,6 +222,8 @@ public class BuySendPromotionService implements IPromotionService {
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
sendGoods
=
sendGoodsMap
.
get
(
cartGood
.
getSpuId
());
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
sendGoods
=
sendGoodsMap
.
get
(
cartGood
.
getSpuId
());
CartGoods
cartGoods
=
shoppingCartConvertAdapter
.
convent2CartGoods
(
cartGood
,
sendGoods
.
getNowPrice
());
CartGoods
cartGoods
=
shoppingCartConvertAdapter
.
convent2CartGoods
(
cartGood
,
sendGoods
.
getNowPrice
());
cartGoods
.
setQty
(
SEND_NUMBER
);
cartGoods
.
setQty
(
SEND_NUMBER
);
cartGoods
.
setClassificationId
(
cartGood
.
getClassificationId
());
cartGoods
.
setClassificationName
(
cartGood
.
getClassificationName
());
newCartGoodsList
.
add
(
cartGoods
);
newCartGoodsList
.
add
(
cartGoods
);
}
}
...
@@ -247,6 +249,8 @@ public class BuySendPromotionService implements IPromotionService {
...
@@ -247,6 +249,8 @@ public class BuySendPromotionService implements IPromotionService {
}
}
cartGoods
.
setUnit
(
productBeanDTO
.
get
().
getUnit
());
cartGoods
.
setUnit
(
productBeanDTO
.
get
().
getUnit
());
cartGoods
.
setWeight
(
productBeanDTO
.
get
().
getWeight
());
cartGoods
.
setWeight
(
productBeanDTO
.
get
().
getWeight
());
cartGoods
.
setClassificationId
(
productBeanDTO
.
get
().
getCategory
());
cartGoods
.
setClassificationName
(
productBeanDTO
.
get
().
getCategoryName
());
}
}
}
}
}
}
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