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
857078fe
Commit
857078fe
authored
Aug 24, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
特价和超值加购活动键位编号赋值
parent
9e61932a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java
+4
-4
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java
View file @
857078fe
...
@@ -119,10 +119,10 @@ public class TimeSaleCalculation {
...
@@ -119,10 +119,10 @@ public class TimeSaleCalculation {
if
((
goods
=
goodsMap
.
get
(
cartGoods
.
getSkuId
()))
==
null
||
ObjectUtils
.
equals
(
ActivityTypeEnum
.
TYPE_81
.
getCode
(),
cartGoods
.
getActivityType
()))
{
if
((
goods
=
goodsMap
.
get
(
cartGoods
.
getSkuId
()))
==
null
||
ObjectUtils
.
equals
(
ActivityTypeEnum
.
TYPE_81
.
getCode
(),
cartGoods
.
getActivityType
()))
{
continue
;
continue
;
}
}
//
if(goods.getArtNo() == null){
if
(
goods
.
getArtNo
()
==
null
){
//
throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
throw
new
ServiceException
(
ResponseResult
.
OPERATE_TOO_OFTEN
);
//
}
}
//
cartGoods.setCustomerCode(goods.getArtNo());
cartGoods
.
setCustomerCode
(
goods
.
getArtNo
());
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
goodsDiscount
=
getGoodsDiscount
(
goods
.
getDiscounts
(),
Arrays
.
asList
(
ActivityTypeEnum
.
TYPE_2
.
getCode
(),
ActivityTypeEnum
.
TYPE_21
.
getCode
(),
ActivityTypeEnum
.
TYPE_23
.
getCode
()));
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
goodsDiscount
=
getGoodsDiscount
(
goods
.
getDiscounts
(),
Arrays
.
asList
(
ActivityTypeEnum
.
TYPE_2
.
getCode
(),
ActivityTypeEnum
.
TYPE_21
.
getCode
(),
ActivityTypeEnum
.
TYPE_23
.
getCode
()));
if
(
goodsDiscount
==
null
)
{
if
(
goodsDiscount
==
null
)
{
continue
;
continue
;
...
...
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