Merge branch 'dev' into 'mp-server-test'

查询优惠券

See merge request quanshu/mp-server!65

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -49,13 +49,13 @@ public class CouponMgrController extends BaseApiController {
 
 	@Autowired
 	private ICouponService couponService;
-	
+
 	@Autowired
 	private ICouponTicketService couponTicketService;
-	
+
 	@Autowired
 	private ISysUserService userService;
-	
+
 	@Autowired
 	private MapperFacade mapperFacade;
 
@@ -70,13 +70,13 @@ public class CouponMgrController extends BaseApiController {
 		startPage();
 		LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<Coupon>();
 		queryWrapper.like(null != coupon && StringUtils.isNotBlank(coupon.getTitle()), Coupon::getTitle, coupon.getTitle());
-		queryWrapper.like(null != coupon && StringUtils.isNotBlank(coupon.getStatus().getValue()), Coupon::getStatus, coupon.getStatus().getValue());
+		queryWrapper.like(null != coupon && null != coupon.getStatus(), Coupon::getStatus, coupon.getStatus());
 		queryWrapper.orderByAsc(Coupon::getCreatedTime);
 		list = couponService.list(queryWrapper);
 		return getDataTable(list);
 	}
-	
-	
+
+
 	/**
 	 * 新增代金券信息
 	 * @param
@@ -112,7 +112,7 @@ public class CouponMgrController extends BaseApiController {
 		} catch (Exception e) {
 			return AjaxResult.error("代金券'" + coupon.getTitle() + "'新增失败" + e.getMessage());
 		}
-		
+
 		return AjaxResult.success("代金券'" + coupon.getTitle() + "'新增成功");
 	}
 
@@ -160,8 +160,8 @@ public class CouponMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("代金券'" + coupon.getTitle() + "'编辑成功");
 	}
-	
-	
+
+
 	/**
 	 * 停用、启用代金券
 	 * @param
@@ -184,5 +184,5 @@ public class CouponMgrController extends BaseApiController {
 		}
 		return AjaxResult.success("操作成功");
 	}
-	
+
 }