记得上下班打卡 | 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
fe1b257c
Commit
fe1b257c
authored
Nov 09, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PM临时+券发放类型:积分兑换;
parent
e00a7329
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
CandyMgtCouponAdminController.java
...troller/zhengzai/candy/CandyMgtCouponAdminController.java
+0
-3
CandyMgtCouponAdminServiceImpl.java
...ai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
+1
-1
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 @
fe1b257c
...
...
@@ -161,9 +161,6 @@ public class CandyMgtCouponAdminController extends BaseController {
@ResponseBody
public
AjaxResult
addSave
(
@RequestBody
@Validated
CandyMgtCouponBuildParam
buildParam
)
{
logger
.
info
(
"operator:{},buildParam:{}"
,
ShiroUtils
.
getLoginName
(),
JsonUtils
.
toJson
(
buildParam
));
if
(
buildParam
.
getBindType
()
==
1
&&
buildParam
.
getEventType
()
==
2
&&
StringUtils
.
isBlank
(
buildParam
.
getEventLimit
()))
{
buildParam
.
setBindType
(
2
);
// TODO: 2021/11/9 PM上线前两天临时加的发放类型,页面交互只做逻辑实现,这里根据条件纠正`bindType`
}
AjaxResult
ajaxResult
=
this
.
buildValidProcessing
(
buildParam
);
if
(((
int
)
ajaxResult
.
get
(
AjaxResult
.
CODE_TAG
))
!=
0
)
{
return
ajaxResult
;
...
...
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 @
fe1b257c
...
...
@@ -254,7 +254,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
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
(
initCoupon
.
getBindType
()
==
2
?
1
:
0
);
// TODO: 2021/11/9 PM上线前
临时加的发放类型(积分兑换)
,这里根据条件设置该记录不执行发放逻辑
initMgtCoupon
.
setEventAmt
(
parameter
.
getEventAmt
());
initMgtCoupon
.
setEventType
(
parameter
.
getEventType
());
initMgtCoupon
.
setEventLimit
(
parameter
.
getEventLimit
());
...
...
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