From 940dca9377f325132da0b0fecbf0a77d2c346102 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Wed, 8 Dec 2021 17:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=A0=E5=88=B8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bweb/controller/HighDiscountPackageController.java    | 2 ++
 .../service/impl/HighDiscountInventoryRecordServiceImpl.java  | 4 ++++
 .../java/com/hai/service/impl/HltUnionCardVipServiceImpl.java | 1 +
 3 files changed, 7 insertions(+)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighDiscountPackageController.java b/hai-bweb/src/main/java/com/bweb/controller/HighDiscountPackageController.java
index ab6ee599..34cd9a75 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighDiscountPackageController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighDiscountPackageController.java
@@ -548,6 +548,7 @@ public class HighDiscountPackageController {
     @ResponseBody
     @ApiOperation(value = "获取优惠券包记录列表")
     public ResponseData getDiscountInventoryRecordServList(
+                                                     @RequestParam(name = "title", required = false) String title,
                                                      @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                                      @RequestParam(name = "pageSize", required = true) Integer pageSize,
                                                      HttpServletRequest request) {
@@ -559,6 +560,7 @@ public class HighDiscountPackageController {
             Map<String,Object> map = new HashMap<>();
 
             map.put("companyId", userInfoModel.getBsCompany().getId());
+            map.put("title", title);
             PageHelper.startPage(pageNum,pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(discountInventoryRecordService.getDiscountInventoryRecordServList(map)));
 
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountInventoryRecordServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountInventoryRecordServiceImpl.java
index cdcb6aed..4e771539 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountInventoryRecordServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountInventoryRecordServiceImpl.java
@@ -27,6 +27,10 @@ public class HighDiscountInventoryRecordServiceImpl implements HighDiscountInven
             criteria.andCompanyIdEqualTo(MapUtils.getInteger(map , "companyId"));
         }
 
+        if (MapUtils.getString(map , "title") != null) {
+            criteria.andDiscountPackageTitleLike("%" + MapUtils.getString(map , "title") + "%");
+        }
+
         example.setOrderByClause("created_time");
 
         return discountInventoryRecordMapper.selectByExample(example);
diff --git a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java
index aac6346e..55636bcb 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java
@@ -105,6 +105,7 @@ public class HltUnionCardVipServiceImpl implements HltUnionCardVipService {
                 map.put("companyId", bsCompany.getId());
                 map.put("usingAttribution", 1);
                 map.put("salesType", 2);
+                map.put("status", 1);
 
                 // 查询话费专属优惠券包
                 List<HighDiscountPackage> highDiscountPackages =  highDiscountPackageService.getDiscountPackageList(map);