记得上下班打卡 | 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
021ea2f3
Commit
021ea2f3
authored
Oct 15, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 商品返回可用演出券 反之同理的bug
parent
506ea472
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
CouponBaseUtil.java
...java/com/liquidnet/service/candy/util/CouponBaseUtil.java
+6
-2
No files found.
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java
View file @
021ea2f3
...
@@ -91,6 +91,8 @@ public class CouponBaseUtil {
...
@@ -91,6 +91,8 @@ public class CouponBaseUtil {
//适用范围 规则
//适用范围 规则
if
(
dtoItem
.
getBusiType
().
equals
(
0
))
{
if
(
dtoItem
.
getBusiType
().
equals
(
0
))
{
isTarget
=
true
;
isTarget
=
true
;
}
else
if
(
dtoItem
.
getBusiType
().
equals
(
2
))
{
isTarget
=
false
;
}
else
{
}
else
{
for
(
CandyCouponRuleDto
ruleItem
:
dtoItem
.
getUseRules
())
{
for
(
CandyCouponRuleDto
ruleItem
:
dtoItem
.
getUseRules
())
{
CandyCouponRulesVo
voRules
=
CandyCouponRulesVo
.
getNew
();
CandyCouponRulesVo
voRules
=
CandyCouponRulesVo
.
getNew
();
...
@@ -128,7 +130,7 @@ public class CouponBaseUtil {
...
@@ -128,7 +130,7 @@ public class CouponBaseUtil {
}
}
}
}
if
(
(
dtoItem
.
getUseRules
().
size
()
==
0
&&
!
dtoItem
.
getBusiType
().
equals
(
0
))
||
dtoItem
.
getBusiType
().
equals
(
2
))
{
if
(
dtoItem
.
getUseRules
().
size
()
==
0
&&
!
dtoItem
.
getBusiType
().
equals
(
0
))
{
isTarget
=
false
;
isTarget
=
false
;
}
}
}
}
...
@@ -178,6 +180,8 @@ public class CouponBaseUtil {
...
@@ -178,6 +180,8 @@ public class CouponBaseUtil {
//适用范围 规则
//适用范围 规则
if
(
dtoItem
.
getBusiType
().
equals
(
0
))
{
if
(
dtoItem
.
getBusiType
().
equals
(
0
))
{
isTarget
=
true
;
isTarget
=
true
;
}
else
if
(
dtoItem
.
getBusiType
().
equals
(
1
)
||
dtoItem
.
getBusiType
().
equals
(
3
))
{
isTarget
=
false
;
}
else
{
}
else
{
for
(
CandyCouponRuleDto
ruleItem
:
dtoItem
.
getUseRules
())
{
for
(
CandyCouponRuleDto
ruleItem
:
dtoItem
.
getUseRules
())
{
CandyCouponRulesVo
voRules
=
CandyCouponRulesVo
.
getNew
();
CandyCouponRulesVo
voRules
=
CandyCouponRulesVo
.
getNew
();
...
@@ -209,7 +213,7 @@ public class CouponBaseUtil {
...
@@ -209,7 +213,7 @@ public class CouponBaseUtil {
}
}
}
}
if
(
(
dtoItem
.
getUseRules
().
size
()
==
0
&&
!
dtoItem
.
getBusiType
().
equals
(
0
))
||
(
dtoItem
.
getBusiType
().
equals
(
1
)
||
dtoItem
.
getBusiType
().
equals
(
3
)
))
{
if
(
dtoItem
.
getUseRules
().
size
()
==
0
&&
!
dtoItem
.
getBusiType
().
equals
(
0
))
{
isTarget
=
false
;
isTarget
=
false
;
}
}
}
}
...
...
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