Commit a020535a authored by zhengyi's avatar zhengyi

优惠列表状态查询逻辑修正

parent b4b038a1
...@@ -1265,20 +1265,18 @@ public class CouponServiceImpl extends AbstractService<CouponMapper, CouponDO> i ...@@ -1265,20 +1265,18 @@ public class CouponServiceImpl extends AbstractService<CouponMapper, CouponDO> i
@Override @Override
public PageResult<CouponDO> getCouponPage(CouponPageReqVO pageReqVO) { public PageResult<CouponDO> getCouponPage(CouponPageReqVO pageReqVO) {
pageReqVO.setIncludeExpiredStatus(false);
if (CollectionUtil.isNotEmpty(pageReqVO.getStatusList())){ if (CollectionUtil.isNotEmpty(pageReqVO.getStatusList())){
if (pageReqVO.getStatusList().contains(2)){ if (pageReqVO.getStatusList().contains(2)){
// 包含已过期状态 // 包含已过期状态
pageReqVO.setOverdueStatus(true); pageReqVO.setOverdueStatus(true);
if (pageReqVO.getStatusList().size() == 1){ if (pageReqVO.getStatusList().size() == 1){
pageReqVO.setStatusList(null); pageReqVO.setStatusList(null);
pageReqVO.setIncludeExpiredStatus(false);
}else { }else {
pageReqVO.getStatusList().remove(2); pageReqVO.getStatusList().remove(2);
pageReqVO.setIncludeExpiredStatus(true); pageReqVO.setIncludeExpiredStatus(true);
} }
} }
}else {
pageReqVO.setIncludeExpiredStatus(false);
} }
PageVO page = new PageVO(); PageVO page = new PageVO();
page.setField("c.coupon_id DESC"); page.setField("c.coupon_id DESC");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment