记得上下班打卡 | git大法好,push需谨慎

Commit f47b63d8 authored by 胡佳晨's avatar 胡佳晨

改回来,修复 消费bug

parent 3f30e549
...@@ -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/"
......
...@@ -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;
} }
......
# -- 使用券 -- # -- 使用券 --
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 = ?
# -- 领取券 -- # -- 领取券 --
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment