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

Skip to content

L
liquidnet-bus-v1
Commit 823cdbfe authored by 张国柄's avatar 张国柄
Browse files
Options

~发券调整:发送需领取的券发放不设置激活时间和失效时间;

parent a7ca60bf
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 20 deletions
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java
View file @ 823cdbfe
...@@ -248,15 +248,18 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C ...@@ -248,15 +248,18 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
userCoupon.setState(1); userCoupon.setState(1);
// userCoupon.setBindAt(couponEffectAt); // userCoupon.setBindAt(couponEffectAt);
// userCoupon.setDuedAt(couponExpireAt); // userCoupon.setDuedAt(couponExpireAt);
userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt); if (coupon.getBindType() != 3) {
if (isMemberRightsCoupon) { userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt);
userCoupon.setDuedAt(userMember.getExpiryAt()); if (isMemberRightsCoupon) {
} else if (null != couponExpireAt && couponExpireAt.isAfter(now)) { userCoupon.setDuedAt(userMember.getExpiryAt());
userCoupon.setDuedAt(couponExpireAt); } else if (null != couponExpireAt && couponExpireAt.isAfter(now)) {
} else { userCoupon.setDuedAt(couponExpireAt);
log.warn("发放券处理中:{}-目标全体会员，该券生效日期或失效日期无效[couponId:{},effectAt:{},expireAt:{}]", mcouponId, couponId, couponEffectAt, couponExpireAt); } else {
continue; log.warn("发放券处理中:{}-目标全体会员，该券生效日期或失效日期无效[couponId:{},effectAt:{},expireAt:{}]", mcouponId, couponId, couponEffectAt, couponExpireAt);
continue;
}
} }
userCoupon.setOperator(operator); userCoupon.setOperator(operator);
userCoupon.setCreatedAt(now); userCoupon.setCreatedAt(now);
...@@ -338,21 +341,24 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C ...@@ -338,21 +341,24 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
userCoupon.setState(1); userCoupon.setState(1);
// userCoupon.setBindAt(couponEffectAt); // userCoupon.setBindAt(couponEffectAt);
userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt); if (coupon.getBindType() != 3) {
if (isMemberRightsCoupon) { userCoupon.setBindAt(null == couponEffectAt ? now : couponEffectAt);
AdamUserMemberVo vo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid)); if (isMemberRightsCoupon) {
if (null != vo && vo.isActive()) { AdamUserMemberVo vo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
userCoupon.setDuedAt(vo.getExpiryAt()); if (null != vo && vo.isActive()) {
} else {// 非会员（或无效会员）跳过 userCoupon.setDuedAt(vo.getExpiryAt());
log.warn("发放券处理中:{}-目标指定手机号，该用户非会员或会员已过期[couponId:{},uid:{}]", mcouponId, couponId, uid); } else {// 非会员（或无效会员）跳过
log.warn("发放券处理中:{}-目标指定手机号，该用户非会员或会员已过期[couponId:{},uid:{}]", mcouponId, couponId, uid);
continue;
}
} else if (null != couponExpireAt && couponExpireAt.isAfter(now)) {
userCoupon.setDuedAt(couponExpireAt);
} else {
log.warn("发放券处理中:{}-目标指定手机号，该券生效日期或失效日期无效[couponId:{},effectAt:{},expireAt:{}]", mcouponId, couponId, couponEffectAt, couponExpireAt);
continue; continue;
} }
} else if (null != couponExpireAt && couponExpireAt.isAfter(now)) {
userCoupon.setDuedAt(couponExpireAt);
} else {
log.warn("发放券处理中:{}-目标指定手机号，该券生效日期或失效日期无效[couponId:{},effectAt:{},expireAt:{}]", mcouponId, couponId, couponEffectAt, couponExpireAt);
continue;
} }
userCoupon.setOperator(operator); userCoupon.setOperator(operator);
userCoupon.setCreatedAt(now); userCoupon.setCreatedAt(now);
......
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