Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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

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

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