'修复已知问题'

hai-service/src/main/java/com/hai/service/impl/HighDiscountCouponRelServiceImpl.java

@@ -30,10 +30,6 @@ public class HighDiscountCouponRelServiceImpl implements HighDiscountCouponRelSe
     @Resource
     private HighCouponService highCouponService;
 
-    @Resource
-    private HighDiscountService highDiscountService;
-
-
     @Override
     public void insertDiscountCoupon(HighDiscountCouponRel highDiscountCouponRel) {
         highDiscountCouponRelMapper.insert(highDiscountCouponRel);

hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java

@@ -5,6 +5,8 @@ import com.hai.entity.HighDiscount;
 import com.hai.entity.HighDiscountCouponRel;
 import com.hai.entity.HighDiscountExample;
 import com.hai.service.HighDiscountService;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,9 +24,6 @@ public class HighDiscountServiceImpl implements HighDiscountService {
     @Resource
     private HighDiscountMapper highDiscountMapper;
 
-    @Resource
-    private HighDiscountCouponRel highDiscountCouponRel;
-
     @Override
     public void insertDiscount(HighDiscount highDiscount) {
         highDiscountMapper.insert(highDiscount);
@@ -45,6 +44,16 @@ public class HighDiscountServiceImpl implements HighDiscountService {
         HighDiscountExample example = new HighDiscountExample();
         HighDiscountExample.Criteria criteria = example.createCriteria();
 
+        if (StringUtils.isBlank(MapUtils.getString(map, "discountKey"))) {
+            criteria.andDiscountKeyEqualTo(MapUtils.getString(map, "discountKey"));
+        }
+        if (StringUtils.isBlank(MapUtils.getString(map, "discountName"))) {
+            criteria.andDiscountNameLike("%" + MapUtils.getString(map, "discountName") + "%");
+        }
+        if (MapUtils.getInteger(map, "discountType") != null) {
+            criteria.andDiscountTypeEqualTo(MapUtils.getInteger(map, "discountType"));
+        }
+
         example.setOrderByClause("update_time desc");
         return highDiscountMapper.selectByExample(example);
     }