From e831642b4243bca5d9d62224f7dd7df7d91ccda3 Mon Sep 17 00:00:00 2001
From: 199901012 <hurui@shinwoten.com>
Date: Wed, 7 Apr 2021 21:21:51 +0800
Subject: [PATCH] =?UTF-8?q?'=E5=AF=BC=E5=85=A5=E3=80=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8D=A1=E5=88=B8=E9=94=80=E5=94=AE=E7=A0=81=E4=B8=8D=E5=8F=97?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=99=90=E5=88=B6'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bweb/controller/HighCouponController.java | 10 ----------
 .../java/com/cweb/controller/HighCouponController.java |  2 --
 2 files changed, 12 deletions(-)

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<String, Object> map = new HashMap<>();
-
             map.put("merchantId", highMerchantStoreService.getMerchantStoreById(storeId).getMerchantId());
             map.put("userId", userInfoModel.getHighUser().getId());
-
             map.put("status", 1);
             PageHelper.startPage(pageNum, pageSize);