From fbd2b6a87215d5744d6a6ee9ea2ce9b1991d54c4 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 24 Jul 2019 17:17:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=87=8D=E8=A6=81][=E9=87=8D=E8=A6=81]:?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F,=E7=BC=96=E4=B8=8D=E8=BF=87!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxBrandController.java | 3 ++- .../com/iformall/controller/basic/WxShopController.java | 8 ++++---- .../controller/market/WxActivityJoinController.java | 3 ++- .../iformall/controller/market/WxCampaignController.java | 3 ++- .../controller/market/WxCouponSendController.java | 3 ++- .../controller/market/WxMerchantSubsidyController.java | 5 +++-- .../com/iformall/controller/market/WxOrderController.java | 7 ++----- .../controller/mem/WxCUserBasicInfoController.java | 4 ++-- .../iformall/controller/mem/WxLevelConfigController.java | 3 ++- .../iformall/controller/rent/WxBillActionController.java | 3 ++- .../iformall/controller/rent/WxBillRentController.java | 3 ++- .../src/main/java/com/iformall/domain/po/BaseEntity.java | 3 +++ 12 files changed, 28 insertions(+), 20 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 85e9debff..519a87b1c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumDelFlag; @@ -47,7 +48,7 @@ public class WxBrandController extends BaseController { if (null == wxBrand) { wxBrand = new WxBrand(); } - wxBrand.setSortColumns(Id_DESC); + wxBrand.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index ecfc2930c..9492c9453 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -128,7 +128,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); return new ResultData(page); } @@ -142,7 +142,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); wxShopService.exportShop(wxShop, request, response); } @@ -155,7 +155,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); wxShopService.exportNotRentShop(wxShop, request, response); } @@ -171,7 +171,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); + wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index 90bdd851e..2a71a7186 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxActivityJoin; import com.iformall.exception.MallinkException; import com.iformall.service.WxActivityJoinService; @@ -44,7 +45,7 @@ public class WxActivityJoinController extends BaseController { wxActivityJoin = new WxActivityJoin(); } wxActivityJoin.setTenantId(getTenantId()); - wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC,WxActivityJoin.Field.Id_DESC); + wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index b366caee6..8bc0288d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -8,6 +8,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; @@ -60,7 +61,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setStatus(null); } wxCampaign.setTenantId(getTenantId()); - wxCampaign.setSortColumns(WxCampaign.Field.CreateTime_DESC,WxCampaign.Field.Id_DESC); + wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } 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 9dea041d1..8b15c6077 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.vo.WxCouponSendVo; @@ -50,7 +51,7 @@ public class WxCouponSendController extends BaseController { if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); - wxCouponSend.setSortColumns(WxCouponSend.Field.CreateDate_DESC); + wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); for (WxCouponSendVo cs:page.getList()) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index e946da6f5..bc4e73244 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.vo.WxMerchantSubsidyVo; @@ -84,7 +85,7 @@ public class WxMerchantSubsidyController extends BaseController { wxMerchantSubsidy.setStatusS(tmpList); } } - wxMerchantSubsidy.setSortColumns(WxMerchantSubsidy.Field.CreateDate_DESC); + wxMerchantSubsidy.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); return new ResultData(page); } @@ -133,7 +134,7 @@ public class WxMerchantSubsidyController extends BaseController { wxMerchantSubsidy.setStatusS(tmpList); } } - wxMerchantSubsidy.setSortColumns(WxMerchantSubsidy.Field.CreateDate_DESC); + wxMerchantSubsidy.setSortColumns(BaseEntity.SortField.CreateDate_DESC); wxMerchantSubsidyService.exportData(wxMerchantSubsidy, request, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 14c9abdb6..2fa18983d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -7,10 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.OrderSaveDto; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxOrderQueryVo; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelType; @@ -63,7 +60,7 @@ public class WxOrderController extends BaseController { logger.debug("[" + getIpAddr() + "] WxOrderController::list"); if (null == wxOrder) wxOrder = new WxOrder(); wxOrder.setTenantId(getTenantId()); - wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC,WxOrder.Field.Id_DESC); + wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 3fb34cd32..6b745c37b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -138,7 +138,7 @@ public class WxCUserBasicInfoController extends BaseController { } String tenantId = getTenantId(); wxCUserBasicInfo.setTenantId(tenantId); - wxCUserBasicInfo.setSortColumns(WxCUserBasicInfo.Field.ActiveTime_DESC); + wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); PageInfo page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); if (page.getSize() > 0) { @@ -228,7 +228,7 @@ public class WxCUserBasicInfoController extends BaseController { WxCouponOrder corder = new WxCouponOrder(); corder.setCUserId(userId); corder.setTenantId(getTenantId()); - corder.setSortColumns(CreateDate_DESC); + corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); if (page.getSize() > 0) { List list = page.getList(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 44ee9f9ac..c460eb43a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -3,6 +3,7 @@ package com.iformall.controller.mem; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +46,7 @@ public class WxLevelConfigController extends BaseController { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(getTenantId()); - wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); + wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index d5bd7a54e..e88df9ee4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBillAction; import com.iformall.service.WxBillActionService; import io.swagger.annotations.Api; @@ -41,7 +42,7 @@ public class WxBillActionController extends BaseController { wxBillAction = new WxBillAction(); } wxBillAction.setTenantId(getTenantId()); - wxBillAction.setSortColumns(WxBillAction.Field.Id_DESC); + wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); PageInfo result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index e48209faa..e9ea04df8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBillRent; import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; @@ -39,7 +40,7 @@ public class WxBillRentController extends BaseController { wxBillRent = new WxBillRent(); } wxBillRent.setTenantId(getTenantId()); - wxBillRent.setSortColumns(WxBillRent.Field.Createtime_DESC,WxBillRent.Field.Id_DESC); + wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxBillRentService.listAsPage(wxBillRent, 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 9dd988b99..cc6eb3eb3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -146,6 +146,9 @@ public class BaseEntity implements Serializable { ReportTime_ASC("`reportTime` ASC"), ReportTime_DESC("`reportTime` DESC"), + ActiveTime_ASC("`active_time` ASC"), + ActiveTime_DESC("`active_time` DESC"), + TopTime_ASC("`top_time` ASC"), TopTime_DESC("`top_time` DESC"),