记得上下班打卡 | 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
033ffb1f
Commit
033ffb1f
authored
Nov 10, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整:创建券发放任务逻辑:券领取类型为`2-积分兑换`时不创建发放任务;
parent
efea1aa1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
CandyMgtCouponAdminServiceImpl.java
...ai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
+4
-3
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
View file @
033ffb1f
...
...
@@ -253,8 +253,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
CandyMgtCoupon
initMgtCoupon
=
new
CandyMgtCoupon
();
initMgtCoupon
.
setMcouponId
(
IDGenerator
.
nextMilliId
());
initMgtCoupon
.
setCouponId
(
initCoupon
.
getCouponId
());
// initMgtCoupon.setState(0);
initMgtCoupon
.
setState
(
initCoupon
.
getBindType
()
==
2
?
1
:
0
);
// TODO: 2021/11/9 PM上线前临时加的发放类型(积分兑换),这里根据条件设置该记录不执行发放逻辑
initMgtCoupon
.
setState
(
0
);
initMgtCoupon
.
setEventAmt
(
parameter
.
getEventAmt
());
initMgtCoupon
.
setEventType
(
parameter
.
getEventType
());
initMgtCoupon
.
setEventLimit
(
parameter
.
getEventLimit
());
...
...
@@ -275,7 +274,9 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
@Transactional
public
boolean
saveMgtCouponInfo
(
CandyCoupon
initCoupon
,
CandyMgtCoupon
initMgtCoupon
,
List
<
CandyCouponRule
>
initCouponRuleList
)
{
int
insertCt
=
candyCouponMapper
.
insert
(
initCoupon
);
insertCt
+=
candyMgtCouponMapper
.
insert
(
initMgtCoupon
);
if
(
initCoupon
.
getBindType
()
!=
2
)
{
// TODO: 2021/11/9 PM上线前临时加的发放类型(2-积分兑换),这里根据发放类型不创建发放任务
insertCt
+=
candyMgtCouponMapper
.
insert
(
initMgtCoupon
);
}
boolean
saveBatch
=
true
;
if
(!
CollectionUtils
.
isEmpty
(
initCouponRuleList
))
{
...
...
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