记得上下班打卡 | 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
f4b081d9
Commit
f4b081d9
authored
Dec 08, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+candy_mgt_coupon.event_driven[区分券发放任务表:后台人为创建与系统创建标识字段];
parent
e22cb80e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
CandyMgtCouponAdminServiceImpl.java
...ai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
+1
-0
CandyMgtCoupon.java
...va/com/liquidnet/service/candy/entity/CandyMgtCoupon.java
+5
-0
CandyMgtCouponMapper.xml
...m/liquidnet/service/candy/mapper/CandyMgtCouponMapper.xml
+1
-1
db_ln_candy_initialdata.sql
...idnet-service-candy-impl/docu/db_ln_candy_initialdata.sql
+2
-1
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 @
f4b081d9
...
@@ -421,6 +421,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
...
@@ -421,6 +421,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
initMgtCoupon
.
setEventType
(
parameter
.
getEventType
());
initMgtCoupon
.
setEventType
(
parameter
.
getEventType
());
initMgtCoupon
.
setEventLimit
(
parameter
.
getEventLimit
());
initMgtCoupon
.
setEventLimit
(
parameter
.
getEventLimit
());
initMgtCoupon
.
setEventAt
(
eventAt
);
initMgtCoupon
.
setEventAt
(
eventAt
);
initMgtCoupon
.
setEventDriven
(
1
);
initMgtCoupon
.
setOperator
(
initCoupon
.
getOperator
());
initMgtCoupon
.
setOperator
(
initCoupon
.
getOperator
());
initMgtCoupon
.
setCreatedAt
(
nowTime
);
initMgtCoupon
.
setCreatedAt
(
nowTime
);
...
...
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyMgtCoupon.java
View file @
f4b081d9
...
@@ -57,6 +57,11 @@ public class CandyMgtCoupon implements Serializable {
...
@@ -57,6 +57,11 @@ public class CandyMgtCoupon implements Serializable {
*/
*/
private
LocalDateTime
eventAt
;
private
LocalDateTime
eventAt
;
/**
* 任务驱动[0-系统自动,1-人为创建]
*/
private
Integer
eventDriven
;
/**
/**
* 专享标识[0-常规|1-会员专属]
* 专享标识[0-常规|1-会员专属]
* <p>
* <p>
...
...
liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyMgtCouponMapper.xml
View file @
f4b081d9
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
FROM candy_mgt_coupon cmc
FROM candy_mgt_coupon cmc
LEFT JOIN candy_coupon cc ON cmc.coupon_id = cc.coupon_id
LEFT JOIN candy_coupon cc ON cmc.coupon_id = cc.coupon_id
WHERE cmc.state
<![CDATA[<>]]>
2
WHERE cmc.state
<![CDATA[<>]]>
2
AND c
c.`exclusive` = 0
AND c
mc.event_driven=1
<if
test=
"mcouponId != null and mcouponId != ''"
>
<if
test=
"mcouponId != null and mcouponId != ''"
>
AND cmc.mcoupon_id = #{mcouponId,jdbcType=VARCHAR}
AND cmc.mcoupon_id = #{mcouponId,jdbcType=VARCHAR}
</if>
</if>
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql
View file @
f4b081d9
...
@@ -162,7 +162,8 @@ alter table candy_mgt_coupon add exclusively smallint default 0 null comment '
...
@@ -162,7 +162,8 @@ alter table candy_mgt_coupon add exclusively smallint default 0 null comment '
alter
table
candy_user_coupon
add
exclusive
smallint
null
comment
'专享标识[0-常规|1-会员礼包]'
after
coupon_id
;
alter
table
candy_user_coupon
add
exclusive
smallint
null
comment
'专享标识[0-常规|1-会员礼包]'
after
coupon_id
;
alter
table
candy_common_coupon
add
exclusive
smallint
null
comment
'专享标识[0-常规|1-会员礼包]'
after
coupon_id
;
alter
table
candy_common_coupon
add
exclusive
smallint
null
comment
'专享标识[0-常规|1-会员礼包]'
after
coupon_id
;
-- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------|20211208券发放任务表+区分后台人为创建与系统创建标识字段
alter
table
candy_mgt_coupon
add
event_driven
tinyint
default
0
null
comment
'任务驱动[0-系统自动,1-人为创建]'
after
event_at
;
-- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------
-- >>------------------------------------------------------------------------------------
...
...
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