提交修改

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);
 

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;
 
     /**
      * 更新人

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"));
         }