记得上下班打卡 | 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
e3c7b407
Commit
e3c7b407
authored
Nov 10, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整:券发放任务逻辑:券领取类型为`2-积分兑换`的处理;
parent
f5dd57ab
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
CandyMgtCouponAdminController.java
...troller/zhengzai/candy/CandyMgtCouponAdminController.java
+1
-1
CandyMgtCouponAdminServiceImpl.java
...ai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
+1
-1
PlatformCandyCouponService.java
...atform/service/impl/candy/PlatformCandyCouponService.java
+16
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java
View file @
e3c7b407
...
@@ -272,7 +272,7 @@ public class CandyMgtCouponAdminController extends BaseController {
...
@@ -272,7 +272,7 @@ public class CandyMgtCouponAdminController extends BaseController {
}
}
}
}
break
;
break
;
case
2
:
// TODO: 2021/11/9 PM上线前临时加的
发放
类型(2-积分兑换)
case
2
:
// TODO: 2021/11/9 PM上线前临时加的
券领取
类型(2-积分兑换)
buildParam
.
setEventType
(
0
);
buildParam
.
setEventType
(
0
);
buildParam
.
setEventLimit
(
null
);
buildParam
.
setEventLimit
(
null
);
break
;
break
;
...
...
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 @
e3c7b407
...
@@ -254,7 +254,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
...
@@ -254,7 +254,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
initMgtCoupon
.
setMcouponId
(
IDGenerator
.
nextMilliId
());
initMgtCoupon
.
setMcouponId
(
IDGenerator
.
nextMilliId
());
initMgtCoupon
.
setCouponId
(
initCoupon
.
getCouponId
());
initMgtCoupon
.
setCouponId
(
initCoupon
.
getCouponId
());
// initMgtCoupon.setState(0);
// initMgtCoupon.setState(0);
initMgtCoupon
.
setState
(
initCoupon
.
getBindType
()
==
2
?
1
:
0
);
// TODO: 2021/11/9 PM上线前临时加的
发放
类型(2-积分兑换),这里根据发放类型设置该记录不执行发放
initMgtCoupon
.
setState
(
initCoupon
.
getBindType
()
==
2
?
1
:
0
);
// TODO: 2021/11/9 PM上线前临时加的
券领取
类型(2-积分兑换),这里根据发放类型设置该记录不执行发放
initMgtCoupon
.
setEventAmt
(
parameter
.
getEventAmt
());
initMgtCoupon
.
setEventAmt
(
parameter
.
getEventAmt
());
initMgtCoupon
.
setEventType
(
parameter
.
getEventType
());
initMgtCoupon
.
setEventType
(
parameter
.
getEventType
());
initMgtCoupon
.
setEventLimit
(
parameter
.
getEventLimit
());
initMgtCoupon
.
setEventLimit
(
parameter
.
getEventLimit
());
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java
View file @
e3c7b407
...
@@ -60,6 +60,22 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
...
@@ -60,6 +60,22 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
this
.
processingCouponCode
(
mgtCoupon
,
coupon
);
this
.
processingCouponCode
(
mgtCoupon
,
coupon
);
break
;
break
;
case
1
:
case
1
:
// switch (mgtCoupon.getEventType()) {// 发放类型[1-会员|2-手机号|10-全体用户]
// case 1:
// this.processForAllMember(mgtCoupon, coupon, couponRuleDtoList);
// break;
// case 2:
// this.processForUserCoupon(mgtCoupon, coupon, couponRuleDtoList);
// break;
// case 10:
// this.processForCommonCoupon(mgtCoupon, coupon, couponRuleDtoList);
// break;
// default:
// log.warn("发放券任务:无法处理,无效的发放类型[mcouponId:{},eventType:{}]", mgtCoupon.getMcouponId(), mgtCoupon.getEventType());
// break;
// }
// break;
case
2
:
// TODO: 2021/11/9 PM上线前临时加的券领取类型(2-积分兑换),这里`1-发放至用户|2-积分兑换`做同逻辑处理
switch
(
mgtCoupon
.
getEventType
())
{
// 发放类型[1-会员|2-手机号|10-全体用户]
switch
(
mgtCoupon
.
getEventType
())
{
// 发放类型[1-会员|2-手机号|10-全体用户]
case
1
:
case
1
:
this
.
processForAllMember
(
mgtCoupon
,
coupon
,
couponRuleDtoList
);
this
.
processForAllMember
(
mgtCoupon
,
coupon
,
couponRuleDtoList
);
...
...
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