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
421dace4
Commit
421dace4
authored
Dec 15, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
餐具商品
parent
ebbdd4ab
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+6
-0
shopping-cart-application-service/src/main/resources/application.properties
+0
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
View file @
421dace4
...
@@ -125,6 +125,10 @@ public class ShoppingCartConvertAdapter {
...
@@ -125,6 +125,10 @@ public class ShoppingCartConvertAdapter {
cartGoodsDetailDto
.
setSpecialExtra
(
cartGoods
.
getSpecialExtra
());
cartGoodsDetailDto
.
setSpecialExtra
(
cartGoods
.
getSpecialExtra
());
cartGoodsDetailDto
.
setClassificationId
(
cartGoods
.
getClassificationId
());
cartGoodsDetailDto
.
setClassificationId
(
cartGoods
.
getClassificationId
());
cartGoodsDetailDto
.
setClassificationName
(
cartGoods
.
getClassificationName
());
cartGoodsDetailDto
.
setClassificationName
(
cartGoods
.
getClassificationName
());
System
.
out
.
println
(
"============================="
);
System
.
out
.
println
(
cartGoods
.
getSkuId
());
System
.
out
.
println
(
mcCafeTablewareSkuId
);
System
.
out
.
println
(
"============================="
);
if
(
mcCafeTablewareSkuId
.
equals
(
cartGoods
.
getSkuId
()))
{
if
(
mcCafeTablewareSkuId
.
equals
(
cartGoods
.
getSkuId
()))
{
cartGoodsDetailDto
.
setIsTableWare
(
true
);
cartGoodsDetailDto
.
setIsTableWare
(
true
);
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
421dace4
...
@@ -19,6 +19,7 @@ import cn.freemud.service.CommonService;
...
@@ -19,6 +19,7 @@ import cn.freemud.service.CommonService;
import
cn.freemud.service.impl.ItemServiceImpl
;
import
cn.freemud.service.impl.ItemServiceImpl
;
import
cn.freemud.service.thirdparty.ActivityClient
;
import
cn.freemud.service.thirdparty.ActivityClient
;
import
cn.freemud.utils.PropertyConvertUtil
;
import
cn.freemud.utils.PropertyConvertUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest
;
import
com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest
;
...
@@ -171,6 +172,7 @@ public class CalculationServiceImpl {
...
@@ -171,6 +172,7 @@ public class CalculationServiceImpl {
public
void
updateShoppingCartGoodsApportion
(
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
,
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
calculationDiscountResult
,
public
void
updateShoppingCartGoodsApportion
(
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
,
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
calculationDiscountResult
,
ShoppingCartGoodsDto
shoppingCartGoodsDto
,
CreateOrderVo
.
PremiumExchangeActivity
premiumExchangeActivity
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
){
ShoppingCartGoodsDto
shoppingCartGoodsDto
,
CreateOrderVo
.
PremiumExchangeActivity
premiumExchangeActivity
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
){
System
.
out
.
println
(
111111
+
JSON
.
toJSONString
(
shoppingCartGoodsDto
));
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
cartGoodsDetailDtoList
=
CollectionUtils
.
isEmpty
(
shoppingCartGoodsDto
.
getProducts
())
?
new
ArrayList
<>()
:
shoppingCartGoodsDto
.
getProducts
();
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
cartGoodsDetailDtoList
=
CollectionUtils
.
isEmpty
(
shoppingCartGoodsDto
.
getProducts
())
?
new
ArrayList
<>()
:
shoppingCartGoodsDto
.
getProducts
();
List
<
ShareDiscountActivityDto
>
shareDiscountActivityDtoList
=
CollectionUtils
.
isEmpty
(
shoppingCartGoodsDto
.
getShareDiscountActivityDtos
())
?
new
ArrayList
<>()
:
shoppingCartGoodsDto
.
getShareDiscountActivityDtos
();
List
<
ShareDiscountActivityDto
>
shareDiscountActivityDtoList
=
CollectionUtils
.
isEmpty
(
shoppingCartGoodsDto
.
getShareDiscountActivityDtos
())
?
new
ArrayList
<>()
:
shoppingCartGoodsDto
.
getShareDiscountActivityDtos
();
//设置空
//设置空
...
@@ -208,6 +210,7 @@ public class CalculationServiceImpl {
...
@@ -208,6 +210,7 @@ public class CalculationServiceImpl {
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
cartGoodsDetailDtos
=
shoppingCartConvertAdapter
.
convertCartGoods2DetailGoodsList
(
cartGoods
,
apportionGoodsList
,
duplicateGoodsMap
);
List
<
ShoppingCartGoodsDto
.
CartGoodsDetailDto
>
cartGoodsDetailDtos
=
shoppingCartConvertAdapter
.
convertCartGoods2DetailGoodsList
(
cartGoods
,
apportionGoodsList
,
duplicateGoodsMap
);
cartGoodsDetailDtoList
.
addAll
(
cartGoodsDetailDtos
);
cartGoodsDetailDtoList
.
addAll
(
cartGoodsDetailDtos
);
}
}
System
.
out
.
println
(
22222222
+
JSON
.
toJSONString
(
shoppingCartGoodsDto
));
List
<
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Discount
>
discounts
=
calculationDiscountResult
==
null
?
new
ArrayList
<>()
:
calculationDiscountResult
.
getDiscounts
();
List
<
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Discount
>
discounts
=
calculationDiscountResult
==
null
?
new
ArrayList
<>()
:
calculationDiscountResult
.
getDiscounts
();
List
<
ActivityDiscountsDto
>
activityDiscountsDtos
=
shoppingCartGoodsDto
.
getActivityDiscountsDtos
()
==
null
?
new
ArrayList
<>()
:
shoppingCartGoodsDto
.
getActivityDiscountsDtos
();
List
<
ActivityDiscountsDto
>
activityDiscountsDtos
=
shoppingCartGoodsDto
.
getActivityDiscountsDtos
()
==
null
?
new
ArrayList
<>()
:
shoppingCartGoodsDto
.
getActivityDiscountsDtos
();
for
(
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Discount
discount
:
discounts
)
{
for
(
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Discount
discount
:
discounts
)
{
...
@@ -267,6 +270,7 @@ public class CalculationServiceImpl {
...
@@ -267,6 +270,7 @@ public class CalculationServiceImpl {
// fullPromotionCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto,premiumExchangeActivity,shoppingCartInfoRequestVo);
// fullPromotionCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto,premiumExchangeActivity,shoppingCartInfoRequestVo);
//限时特价
//限时特价
timeSaleCalculation
.
updateShoppingCartGoodsApportion
(
calculationDiscountResult
,
shoppingCartGoodsDto
);
timeSaleCalculation
.
updateShoppingCartGoodsApportion
(
calculationDiscountResult
,
shoppingCartGoodsDto
);
System
.
out
.
println
(
333333333
+
JSON
.
toJSONString
(
shoppingCartGoodsDto
));
CouponPromotionVO
couponPromotionVO
=
new
CouponPromotionVO
();
CouponPromotionVO
couponPromotionVO
=
new
CouponPromotionVO
();
// couponPromotionVO.setPartnerId("1206");
// couponPromotionVO.setPartnerId("1206");
...
@@ -277,8 +281,10 @@ public class CalculationServiceImpl {
...
@@ -277,8 +281,10 @@ public class CalculationServiceImpl {
// couponPromotionVO.setFlg(CouponFlag.YES.getCode());
// couponPromotionVO.setFlg(CouponFlag.YES.getCode());
//优惠券
//优惠券
couponDiscountCalculation
.
updateShoppingCartGoodsApportion
(
calculationDiscountResult
,
shoppingCartGoodsDto
,
shoppingCartInfoRequestVo
);
couponDiscountCalculation
.
updateShoppingCartGoodsApportion
(
calculationDiscountResult
,
shoppingCartGoodsDto
,
shoppingCartInfoRequestVo
);
System
.
out
.
println
(
444444444
+
JSON
.
toJSONString
(
shoppingCartGoodsDto
));
setMealCalculation
.
updateShoppingCartGoodsApportion
(
shoppingCartGoodsResponseVo
,
calculationDiscountResult
,
shoppingCartGoodsDto
);
setMealCalculation
.
updateShoppingCartGoodsApportion
(
shoppingCartGoodsResponseVo
,
calculationDiscountResult
,
shoppingCartGoodsDto
);
System
.
out
.
println
(
555555555
+
JSON
.
toJSONString
(
shoppingCartGoodsDto
));
}
}
...
...
shopping-cart-application-service/src/main/resources/application.properties
View file @
421dace4
...
@@ -23,5 +23,3 @@ management.endpoint.shutdown.enabled=true
...
@@ -23,5 +23,3 @@ management.endpoint.shutdown.enabled=true
management.security.enabled
=
false
management.security.enabled
=
false
management.health.rabbit.enabled
=
false
management.health.rabbit.enabled
=
false
mccafe.tableware.skuId
=
12345
\ No newline at end of file
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