diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 962922a6a..5ca1c9eb6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -66,7 +66,6 @@ public class WxCouponSendController extends BaseController { // } // } wxCouponSend.setStatus(valid); - wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 1328767e0..08e79c378 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -67,7 +67,7 @@ public class WxCouponSend extends BaseEntity { public static final String SORT_REMAIN = "merchantRemain" ; @JsonIgnore - public static final String SORT_CREATE_DATE = "create_date" ; + public static final String SORT_CREATE_DATE = "createDate" ; @Id protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 5c9ea266b..596cd233a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -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())); diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 858da37e1..ab589f6ba 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -24,7 +24,7 @@ - cs.id,cs.tenant_id,cs.coupon_id,cs.title,cs.send_type,cs.conditions,cs.status,cs.create_date,cs.update_date, + cs.id,cs.tenant_id,cs.coupon_id,cs.title,cs.send_type,cs.conditions,cs.status,cs.create_date as createDate,cs.update_date, cs.conditions -> '$.merchantSend' as merchantSend, cs.conditions -> '$.merchantLnventory' as merchantLnventory, cs.conditions -> '$.merchantRemain' as merchantRemain,