|
@@ -86,7 +86,7 @@ public class CmCouponClubService extends CrudService<CmCouponClubDao, CmCouponCl
|
|
|
map.put("msg", "兑换码已使用,请更换兑换码进行兑换");
|
|
|
return map;
|
|
|
}
|
|
|
- CmCoupon coupon = cmCouponClubDao.getCoupons(redemptionCode.getCouponId());
|
|
|
+ CmCoupon coupon = cmCouponClubDao.getCoupons(cmCouponRedemptionCode.getCouponId());
|
|
|
Date date = new Date();
|
|
|
if (coupon == null || date.compareTo(coupon.getStartDate()) < 0 || date.compareTo(coupon.getEndDate()) > 0) {
|
|
|
map.put("code", -1);
|
|
@@ -94,7 +94,7 @@ public class CmCouponClubService extends CrudService<CmCouponClubDao, CmCouponCl
|
|
|
return map;
|
|
|
}
|
|
|
CmCouponClub couponClub = new CmCouponClub();
|
|
|
- couponClub.setCouponId(redemptionCode.getCouponId());
|
|
|
+ couponClub.setCouponId(cmCouponRedemptionCode.getCouponId());
|
|
|
couponClub.setUserId(redemptionCode.getUserId());
|
|
|
couponClub.setSource("4");
|
|
|
couponClub.setStatus("1");
|