记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
bd9c13db
Commit
bd9c13db
authored
Oct 13, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
库存回滚逻辑
parent
65a64a6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
CandyCouponServiceImpl.java
...et/service/candy/service/impl/CandyCouponServiceImpl.java
+2
-2
CouponBaseUtil.java
...java/com/liquidnet/service/candy/util/CouponBaseUtil.java
+0
-1
No files found.
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java
View file @
bd9c13db
...
...
@@ -147,7 +147,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
for
(
CandyUserCouponBasicDto
dtoItem
:
dtoList
)
{
CandyCouponVo
baseVo
=
CouponBaseUtil
.
getPerformanceCouponUserVo
(
dtoItem
,
priceTotal
,
performanceId
,
timeId
,
ticketId
);
if
(
type
==
1
)
{
if
(
baseVo
.
getState
().
equals
(
3
)
||
dtoItem
.
getState
().
equals
(
5
)
||
dtoItem
.
getState
().
equals
(
21
)
)
{
if
(
baseVo
.
getState
().
equals
(
3
)
||
dtoItem
.
getState
().
equals
(
5
))
{
continue
;
}
}
else
if
(
type
==
2
)
{
...
...
@@ -216,7 +216,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
for
(
CandyUserCouponBasicDto
dtoItem
:
dtoList
)
{
CandyCouponVo
baseVo
=
CouponBaseUtil
.
getGoodCouponUserVo
(
dtoItem
,
priceTotal
,
goodId
,
dtoList
.
size
());
if
(
type
==
1
)
{
if
(
baseVo
.
getState
().
equals
(
3
)
||
dtoItem
.
getState
().
equals
(
5
)
||
dtoItem
.
getState
().
equals
(
21
)
)
{
if
(
baseVo
.
getState
().
equals
(
3
)
||
dtoItem
.
getState
().
equals
(
5
))
{
continue
;
}
}
else
if
(
type
==
2
)
{
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java
View file @
bd9c13db
...
...
@@ -177,7 +177,6 @@ public class CouponBaseUtil {
voRules
.
setBusiId
(
ruleItem
.
getBusiId
());
voRules
.
setBusiName
(
ruleItem
.
getBusiName
());
rulesVoList
.
add
(
voRules
);
System
.
out
.
println
(
dtoItem
.
getUcouponId
());
switch
(
ruleItem
.
getUseScope
())
{
case
80
:
//商品
isTarget
=
isTargetCoupon
(
ruleItem
.
getBusiId
(),
dtoItem
.
getCouType
(),
goodId
,
priceTotal
,
dtoItem
.
getValOver
());
...
...
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