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

hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java

@@ -82,7 +82,7 @@ public class HighCouponController {
                     || StringUtils.isBlank(highCoupon.getCouponDesc())
                     || highCoupon.getCouponType() == null
                     || highCoupon.getPayType() == null
-                    || highCoupon.getDisplayArea() == null
+//                    || highCoupon.getDisplayArea() == null
                     || highCoupon.getSalesEndTime() == null
                     || highCoupon.getRecycleDay() == null
                     || highCoupon.getLimitNumber()== null
@@ -174,7 +174,7 @@ public class HighCouponController {
                     || StringUtils.isBlank(highCoupon.getCouponDesc())
                     || highCoupon.getCouponType() == null
                     || highCoupon.getPayType() == null
-                    || highCoupon.getDisplayArea() == null
+//                    || highCoupon.getDisplayArea() == null
                     || highCoupon.getSalesEndTime() == null
                     || highCoupon.getRecycleDay() == null
                     || highCoupon.getLimitNumber()== null
@@ -359,6 +359,7 @@ public class HighCouponController {
                                       @RequestParam(name = "couponName", required = false) String couponName,
                                       @RequestParam(name = "couponType", required = false) Integer couponType,
                                       @RequestParam(name = "displayArea", required = false) Integer displayArea,
+                                      @RequestParam(name = "couponSource", required = false) Integer couponSource,
                                       @RequestParam(name = "status", required = false) Integer status,
                                       @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                       @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) {
@@ -376,6 +377,7 @@ public class HighCouponController {
             map.put("couponName", couponName);
             map.put("couponType", couponType);
             map.put("displayArea", displayArea);
+            map.put("couponSource", couponSource);
             map.put("status", status);
 
 

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

@@ -345,6 +345,10 @@ public class HighCouponServiceImpl implements HighCouponService {
             criteria.andDisplayAreaEqualTo(MapUtils.getInteger(map, "displayArea"));
         }
 
+        if (MapUtils.getInteger(map, "couponSource") != null) {
+            criteria.andCouponSourceEqualTo(MapUtils.getInteger(map, "couponSource"));
+        }
+
         if (MapUtils.getInteger(map, "status") != null) {
             criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
         }