记得上下班打卡 | 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
f47b63d8
Commit
f47b63d8
authored
Oct 12, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改回来,修复 消费bug
parent
3f30e549
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
liquidnet-service-platform-dev.yml
...onfig/liquidnet-config/liquidnet-service-platform-dev.yml
+2
-2
CouponBaseUtil.java
...java/com/liquidnet/service/candy/util/CouponBaseUtil.java
+6
-6
sqlmap.properties
...t-service-candy-impl/src/main/resources/sqlmap.properties
+1
-2
No files found.
liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-dev.yml
View file @
f47b63d8
...
@@ -15,10 +15,10 @@ liquidnet:
...
@@ -15,10 +15,10 @@ liquidnet:
rabbitmq
:
rabbitmq
:
connection-timeout
:
5000
connection-timeout
:
5000
mysql
:
mysql
:
database-name
:
dev
_ln_scene
database-name
:
test
_ln_scene
mongodb
:
mongodb
:
sslEnabled
:
false
sslEnabled
:
false
database
:
dev
_ln_scene
database
:
test
_ln_scene
al-oss
:
al-oss
:
imgUrl
:
"
https://img.zhengzai.tv/"
imgUrl
:
"
https://img.zhengzai.tv/"
appUrl
:
"
https://app.zhengzai.tv/"
appUrl
:
"
https://app.zhengzai.tv/"
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java
View file @
f47b63d8
...
@@ -255,13 +255,13 @@ public class CouponBaseUtil {
...
@@ -255,13 +255,13 @@ public class CouponBaseUtil {
//券状态
//券状态
Integer
data
;
Integer
data
;
if
(
state
.
equals
(
1
))
{
if
(
state
.
equals
(
1
))
{
//
if (currentTime.isAfter(expireAt)) {
if
(
currentTime
.
isAfter
(
expireAt
))
{
//
data = 3;
data
=
3
;
//
} else if (currentTime.isBefore(effectAt)) {
}
else
if
(
currentTime
.
isBefore
(
effectAt
))
{
//
data = 31;
data
=
31
;
//
} else {
}
else
{
data
=
state
;
data
=
state
;
//
}
}
}
else
{
}
else
{
data
=
state
;
data
=
state
;
}
}
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/sqlmap.properties
View file @
f47b63d8
# -- 使用券 --
# -- 使用券 --
candy_coupon.use
=
UPDATE candy_user_coupon SET state = 3 ,used_at = ? , used_for = ? WHERE uid = ? AND ucoupon_id = ?
candy_coupon.use
=
UPDATE candy_user_coupon SET state = 3 ,used_at = ? , used_for = ? WHERE uid = ? AND ucoupon_id = ?
candy_coupon.use_insert
=
INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id , used_at , used_for ) VALUE ( ? , ? , 3 , ? , ? )
candy_coupon.use_insert
=
INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id , used_at , used_for ) VALUE ( ? , ? , 3 , ? , ? ,? )
# -- 回退券 --
# -- 回退券 --
candy_coupon.back
=
UPDATE candy_user_coupon SET state = 1 WHERE uid = ? AND ucoupon_id = ?
candy_coupon.back
=
UPDATE candy_user_coupon SET state = 1 WHERE uid = ? AND ucoupon_id = ?
# -- 领取券 --
# -- 领取券 --
...
...
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