From 73c0a1bb42ad9f748ddffcbed5a037165acec09a Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Tue, 30 Nov 2021 00:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bweb/controller/HighDiscountController.java  | 2 ++
 .../src/main/java/com/hai/entity/HighDiscountPackage.java      | 2 +-
 .../java/com/hai/service/impl/HighDiscountServiceImpl.java     | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighDiscountController.java b/hai-bweb/src/main/java/com/bweb/controller/HighDiscountController.java
index 03cc9c83..97e51846 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighDiscountController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighDiscountController.java
@@ -192,6 +192,7 @@ public class HighDiscountController {
     public ResponseData getDiscountList(@RequestParam(name = "discountKey", required = false) String discountKey,
                                         @RequestParam(name = "discountName", required = false) String discountName,
                                         @RequestParam(name = "discountType", required = false) Integer discountType,
+                                        @RequestParam(name = "useScope", required = false) Integer useScope,
                                         @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                         @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) {
         try {
@@ -204,6 +205,7 @@ public class HighDiscountController {
             Map<String, Object> map = new HashMap<>();
             map.put("companyId", userInfoModel.getBsCompany().getId());
             map.put("discountKey", discountKey);
+            map.put("useScope", useScope);
             map.put("discountName", discountName);
             map.put("discountType", discountType);
 
diff --git a/hai-service/src/main/java/com/hai/entity/HighDiscountPackage.java b/hai-service/src/main/java/com/hai/entity/HighDiscountPackage.java
index 7d4d94e5..2841f2fb 100644
--- a/hai-service/src/main/java/com/hai/entity/HighDiscountPackage.java
+++ b/hai-service/src/main/java/com/hai/entity/HighDiscountPackage.java
@@ -77,7 +77,7 @@ public class HighDiscountPackage implements Serializable {
     /**
      * 创建时间
      */
-    private Date createdTime;
+        private Date createdTime;
 
     /**
      * 更新人
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java
index 593a7371..67f3b98c 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java
@@ -53,6 +53,9 @@ public class HighDiscountServiceImpl implements HighDiscountService {
         if (MapUtils.getInteger(map, "discountType") != null) {
             criteria.andDiscountTypeEqualTo(MapUtils.getInteger(map, "discountType"));
         }
+        if (MapUtils.getInteger(map, "useScope") != null) {
+            criteria.andUseScopeEqualTo(MapUtils.getInteger(map, "useScope"));
+        }
         if (MapUtils.getLong(map, "companyId") != null) {
             criteria.andCompanyIdEqualTo(MapUtils.getLong(map, "companyId"));
         }