diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java index a0afc764..33cd5ac4 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java @@ -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(); diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java b/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java index 49bb5d6c..48e712cb 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java @@ -212,10 +212,8 @@ public class HighCouponController { HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); Map map = new HashMap<>(); - map.put("merchantId", highMerchantStoreService.getMerchantStoreById(storeId).getMerchantId()); map.put("userId", userInfoModel.getHighUser().getId()); - map.put("status", 1); PageHelper.startPage(pageNum, pageSize);