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

Commit de82c724 authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into...

Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into dev_member_voucher_refund_09151
parents 5adf9280 8f02044c
...@@ -295,6 +295,7 @@ public class CouponBaseUtil { ...@@ -295,6 +295,7 @@ public class CouponBaseUtil {
if (dtoItem.getUcouponId().equals(uCouponId)) { if (dtoItem.getUcouponId().equals(uCouponId)) {
if (dtoItem.getState().equals(1)) { if (dtoItem.getState().equals(1)) {
dtoItem.setState(5); dtoItem.setState(5);
dtoItem.setUsedAt(LocalDateTime.now());
dtoItem.setUsedFor(content); dtoItem.setUsedFor(content);
isHas = true;//券存在 isHas = true;//券存在
} else { } else {
...@@ -322,6 +323,8 @@ public class CouponBaseUtil { ...@@ -322,6 +323,8 @@ public class CouponBaseUtil {
if (uCouponIdList.contains(dtoItem.getUcouponId())) { if (uCouponIdList.contains(dtoItem.getUcouponId())) {
if (dtoItem.getState().equals(5)) { if (dtoItem.getState().equals(5)) {
dtoItem.setState(1); dtoItem.setState(1);
dtoItem.setUsedFor("");
dtoItem.setUsedAt(null);
isHas = true;//券存在 isHas = true;//券存在
} else { } else {
} }
......
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