|
|
|
@@ -112,8 +112,9 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
RedisTemplate<String, PageInfo<WxCouponChannelVo>> cdRedisTemplate; |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { |
|
|
|
public ResultData list(TenantEntity tenantEntity,WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { |
|
|
|
if (null == wxCoupon) wxCoupon = new WxCoupon(); |
|
|
|
wxCoupon.updateTenantInfo(tenantEntity); |
|
|
|
wxCoupon.setSortColumns(BaseEntity.SortField.CCreateDate_DESC, BaseEntity.SortField.CId_DESC); |
|
|
|
PageInfo<WxCoupon> page = null; |
|
|
|
if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) |
|
|
|
@@ -129,7 +130,7 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
wxCoupon.setPressModelId(couponModel.getPressModelId()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
page = listAsPage(wxCoupon, pageNum, pageSize); |
|
|
|
|
|
|
|
List<WxCoupon> wxCouponList = page.getList(); |
|
|
|
|