|
|
|
@ -391,8 +391,6 @@ public class HighCouponController { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ResponseMsgUtil.success(new PageInfo<>(highCouponService.getCouponList(map))); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("HighCouponController -> getCouponList() error!",e); |
|
|
|
@ -421,10 +419,6 @@ public class HighCouponController { |
|
|
|
|
log.error("HighCouponController -> writeStock() error!","卡卷类型错误"); |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_TYPE_ERROR, ""); |
|
|
|
|
} |
|
|
|
|
if (coupon.getStatus() != 1 && coupon.getStatus() != 3) { |
|
|
|
|
log.error("HighCouponController -> writeStock() error!","卡卷状态错误"); |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_STATUS_ERROR, ""); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ImportCouponListener importCouponListener = new ImportCouponListener(); |
|
|
|
|
importCouponListener.initData(coupon,userInfoModel, highCouponCodeService); |
|
|
|
@ -470,10 +464,6 @@ public class HighCouponController { |
|
|
|
|
log.error("HighCouponController -> writeStock() error!","卡卷类型错误"); |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_TYPE_ERROR, ""); |
|
|
|
|
} |
|
|
|
|
if (coupon.getStatus() != 1) { |
|
|
|
|
log.error("HighCouponController -> writeStock() error!","卡卷状态错误"); |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COUPON_STATUS_ERROR, ""); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 销售截止时间
|
|
|
|
|
Calendar salesEndTimeC = Calendar.getInstance(); |
|
|
|
|