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

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

~API:发放券+exclusively发放逻辑调整;

parent 1abbb26a
......@@ -312,6 +312,11 @@ public class CandyMgtCouponAdminController extends BaseController {
logger.warn("Invalid operation[buildParam.bindType={}]", buildParam.getBindType());
return this.error(AjaxResult.Type.WARN, "券领取方式无效");
}
if (buildParam.getValidity() < 0 || (buildParam.getExclusively() == 0 && buildParam.getValidity() <= 0)) {
return AjaxResult.warn("有效期无效");
}
return AjaxResult.success();
}
......
......@@ -236,8 +236,9 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
userCoupon.setCouponId(coupon.getCouponId());
userCoupon.setExclusive(exclusively);
userCoupon.setState(1);
userCoupon.setBindAt(coupon.getEffectAt());
// userCoupon.setBindAt(coupon.getEffectAt());
// userCoupon.setDuedAt(coupon.getExpireAt());
userCoupon.setBindAt(now);
if (isMemberRightsCoupon) {
userCoupon.setDuedAt(userMember.getExpiryAt());
} else {
......@@ -311,10 +312,11 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
userCoupon.setExclusive(exclusively);
userCoupon.setState(1);
userCoupon.setBindAt(coupon.getEffectAt());
// userCoupon.setBindAt(coupon.getEffectAt());
userCoupon.setBindAt(now);
if (isMemberRightsCoupon) {
AdamUserMemberVo vo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
userCoupon.setDuedAt(vo.getExpiryAt());
userCoupon.setDuedAt(null != vo && vo.isActive() ? vo.getExpiryAt() : coupon.getExpireAt());
} else {
userCoupon.setDuedAt(coupon.getExpireAt());
}
......
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