diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index ebbcfde26..7f5485c41 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -76,7 +76,7 @@ public class WxCouponController extends BaseController { if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); } - return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 + return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } @ApiOperation("分页列表接口") @@ -102,7 +102,7 @@ public class WxCouponController extends BaseController { if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); } - return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 + return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } @ApiOperation("新增接口") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 708ade309..786ab95ea 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -74,7 +74,7 @@ public class WxCouponController extends BaseController { wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); } - return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 + return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } @ApiOperation("分页列表接口") @@ -100,7 +100,7 @@ public class WxCouponController extends BaseController { if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); } - return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 + return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } private Map generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, WxCoupon wxCoupon,String remark,String phone) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index d21aa1259..0b5f0724d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -15,7 +15,7 @@ import com.iformall.domain.vo.WxCouponStatisVo; public interface WxCouponService { - ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize); + ResultData list(TenantEntity tenantEntity,WxCoupon wxCoupon, Integer pageNum, Integer pageSize); /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index f229fc2d9..b9cea7974 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -112,8 +112,9 @@ public class WxCouponServiceImpl implements WxCouponService { RedisTemplate> 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 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 wxCouponList = page.getList();