|
|
|
@@ -75,7 +75,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { |
|
|
|
String sortStr = null; |
|
|
|
if (Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_LNVENTORY) || |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_SEND) || |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)) { |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)|| |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_CREATE_DATE)) { |
|
|
|
sortStr = record.getSortColumn() + " " + record.getSortOrder(); |
|
|
|
record.setSortColumn(null); |
|
|
|
} |
|
|
|
@@ -92,6 +93,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { |
|
|
|
cs.setExpired(expired); |
|
|
|
} |
|
|
|
} else { |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateDate_DESC); |
|
|
|
pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record)); |
|
|
|
for (WxCouponSendVo cs:pageInfo.getList()) |
|
|
|
cs.setSendCount(wxCouponActionLogService.getCountByChannelId(record.getTenantId(), cs.getSendType(), cs.getId())); |
|
|
|
|