diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index fe00c456a..fe3e74209 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; import com.iformall.exception.MallinkException; @@ -37,7 +38,7 @@ public class WxActivityJoinController extends BaseController { if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); wxActivityJoin.setUserId(getUserId()); wxActivityJoin.setTenantId(getTenantId()); - wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC); + wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC); final PageInfo page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index bbd4b1f6e..104493411 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponChannelVo; @@ -25,8 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; -import static com.iformall.domain.po.WxCampaign.Field.CreateTime_ASC; -import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC; @RestController @RequestMapping("/api/wxCampaign") @@ -49,7 +48,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setTenantId(getTenantId()); - wxCampaign.setSortColumns(SortNum_ASC, CreateTime_ASC); + wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC); final PageInfo page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index f95779546..f8f2ad79b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -808,11 +808,11 @@ public class WxCarController extends BaseController { wxCouponOrder.setTenantId(getTenantId()); wxCouponOrder.setCUserId(getUserId()); if (wxCouponOrder.getCouponOrderStatus() == null) - wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) - wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); else - wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); + wxCouponOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); return wxCouponOrderService.carListCUserVoAsPage(wxCouponOrder, pageNum, pageSize); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 50295db22..fcb49e1c3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -1,6 +1,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelActivityStatus; @@ -49,7 +50,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); return new ResultData(page); @@ -64,7 +65,7 @@ public class WxCouponChannelController extends BaseController { public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); Map map = new HashedMap(); PageInfo page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index d5e33c65a..1889fafd1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.vo.WxCardCVo; import com.iformall.domain.vo.WxCouponOrderCVo; @@ -49,11 +50,11 @@ public class WxCouponOrderController extends BaseController { if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); wxCouponOrder.setCUserId(getUserId()); if (wxCouponOrder.getCouponOrderStatus() == null) - wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC, WxCouponOrder.Field.Id_DESC); + wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) - wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC, WxCouponOrder.Field.Id_DESC); + wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); else - wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC, WxCouponOrder.Field.Id_DESC); + wxCouponOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); PageInfo page = wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize); @@ -150,11 +151,11 @@ public class WxCouponOrderController extends BaseController { } } if (cardCVo.getCouponOrderStatus() == null) - cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + cardCVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode()) - cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + cardCVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); else - cardCVo.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); + cardCVo.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); return wxCouponOrderService.listCardVoAsPage(cardCVo, pageNum, pageSize); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 28947e1bd..2a2b2fdb4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.exception.MallinkException; @@ -48,7 +49,7 @@ public class WxCreditHistoryController extends BaseController{ log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(getUserId()); - wxCreditHistory.setSortColumns(WxCreditHistory.Field.CreateDate_DESC,WxCreditHistory.Field.Id_DESC); + wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 90cc53337..cdb4fb1fc 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -214,7 +214,7 @@ public class WxOrderController extends BaseController { // c端用户应该只能看到自己的订单 if (wxOrder == null) wxOrder = new WxOrder(); wxOrder.setCUserId(getUserId()); - wxOrder.setSortColumns(WxOrder.Field.UpdateDate_DESC); + wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); Date now = new Date(); @@ -345,7 +345,7 @@ public class WxOrderController extends BaseController { // c端用户应该只能看到自己的订单 if (wxOrder == null) wxOrder = new WxOrder(); wxOrder.setCUserId(getUserId()); - wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC); + wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index 68da5440e..7d4f5dd81 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxScoreHistory; import com.iformall.service.WxScoreHistoryService; @@ -31,7 +32,7 @@ public class WxScoreHistoryController extends BaseController { WxScoreHistory wxScoreHistory = new WxScoreHistory(); wxScoreHistory.setTenantId(getTenantId()); wxScoreHistory.setCUserId(getUserId()); - wxScoreHistory.setSortColumns(WxScoreHistory.Field.CreateDate_DESC); + wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index cc6eb3eb3..6dd92bcfc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -91,22 +91,6 @@ public class BaseEntity implements Serializable { return result.toString(); } - public void setSortColumns(Field... fields) { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - this.sortColumns = sb.toString(); - } public void setSortColumns(SortField... fields) { @@ -158,6 +142,9 @@ public class BaseEntity implements Serializable { LimitDate_ASC("`limit_date` ASC"), LimitDate_DESC("`limit_date` DESC"), + SortNum_ASC("`sort_num` ASC"), + SortNum_DESC("`sort_num` DESC"), + Sort_ASC("`sort` ASC"), Sort_DESC("`sort` DESC"),