|
|
|
@@ -75,11 +75,12 @@ 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_CREATE_DATE)) { |
|
|
|
sortStr = record.getSortColumn() + " " + record.getSortOrder(); |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)) { |
|
|
|
sortStr = record.getSortColumn() + " " + record.getSortOrder(); |
|
|
|
} else if (Objects.equals(record.getSortColumn(), "createDate")) { |
|
|
|
sortStr = "create_date" + " " + record.getSortOrder(); |
|
|
|
} |
|
|
|
record.setSortColumn(null); |
|
|
|
} |
|
|
|
record.setSortCol(sortStr); |
|
|
|
pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVoByValidType(record)); |
|
|
|
for (WxCouponSendVo cs : pageInfo.getList()) { |
|
|
|
|