| @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.WxBrand; | import com.iformall.domain.po.WxBrand; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.enums.EnumDelFlag; | import com.iformall.enums.EnumDelFlag; | ||||
| @@ -47,7 +48,7 @@ public class WxBrandController extends BaseController { | |||||
| if (null == wxBrand) { | if (null == wxBrand) { | ||||
| wxBrand = new WxBrand(); | wxBrand = new WxBrand(); | ||||
| } | } | ||||
| wxBrand.setSortColumns(Id_DESC); | |||||
| wxBrand.setSortColumns(BaseEntity.SortField.Id_DESC); | |||||
| final PageInfo<WxBrand> page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); | final PageInfo<WxBrand> page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -128,7 +128,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | 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<Map<String, Object>> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -142,7 +142,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | 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); | wxShopService.exportShop(wxShop, request, response); | ||||
| } | } | ||||
| @@ -155,7 +155,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | 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); | wxShopService.exportNotRentShop(wxShop, request, response); | ||||
| } | } | ||||
| @@ -171,7 +171,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.setTenantId(getTenantId()); | 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<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.WxActivityJoin; | import com.iformall.domain.po.WxActivityJoin; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.WxActivityJoinService; | import com.iformall.service.WxActivityJoinService; | ||||
| @@ -44,7 +45,7 @@ public class WxActivityJoinController extends BaseController { | |||||
| wxActivityJoin = new WxActivityJoin(); | wxActivityJoin = new WxActivityJoin(); | ||||
| } | } | ||||
| wxActivityJoin.setTenantId(getTenantId()); | 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<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); | final PageInfo<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -8,6 +8,7 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.WxCampaign; | import com.iformall.domain.po.WxCampaign; | ||||
| import com.iformall.domain.po.WxCoupon; | import com.iformall.domain.po.WxCoupon; | ||||
| import com.iformall.domain.po.WxCouponChannel; | import com.iformall.domain.po.WxCouponChannel; | ||||
| @@ -60,7 +61,7 @@ public class WxCampaignController extends BaseController { | |||||
| wxCampaign.setStatus(null); | wxCampaign.setStatus(null); | ||||
| } | } | ||||
| wxCampaign.setTenantId(getTenantId()); | 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<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.WxCoupon; | import com.iformall.domain.po.WxCoupon; | ||||
| import com.iformall.domain.po.WxCouponSend; | import com.iformall.domain.po.WxCouponSend; | ||||
| import com.iformall.domain.vo.WxCouponSendVo; | import com.iformall.domain.vo.WxCouponSendVo; | ||||
| @@ -50,7 +51,7 @@ public class WxCouponSendController extends BaseController { | |||||
| if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); | if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); | ||||
| wxCouponSend.setTenantId(getTenantId()); | wxCouponSend.setTenantId(getTenantId()); | ||||
| wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); | ||||
| wxCouponSend.setSortColumns(WxCouponSend.Field.CreateDate_DESC); | |||||
| wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); | final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); | ||||
| for (WxCouponSendVo cs:page.getList()) | for (WxCouponSendVo cs:page.getList()) | ||||
| @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.WxMerchantSubsidy; | import com.iformall.domain.po.WxMerchantSubsidy; | ||||
| import com.iformall.domain.vo.WxMerchantSubsidyVo; | import com.iformall.domain.vo.WxMerchantSubsidyVo; | ||||
| @@ -84,7 +85,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| wxMerchantSubsidy.setStatusS(tmpList); | wxMerchantSubsidy.setStatusS(tmpList); | ||||
| } | } | ||||
| } | } | ||||
| wxMerchantSubsidy.setSortColumns(WxMerchantSubsidy.Field.CreateDate_DESC); | |||||
| wxMerchantSubsidy.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| final PageInfo<WxMerchantSubsidyVo> page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); | final PageInfo<WxMerchantSubsidyVo> page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -133,7 +134,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||||
| wxMerchantSubsidy.setStatusS(tmpList); | wxMerchantSubsidy.setStatusS(tmpList); | ||||
| } | } | ||||
| } | } | ||||
| wxMerchantSubsidy.setSortColumns(WxMerchantSubsidy.Field.CreateDate_DESC); | |||||
| wxMerchantSubsidy.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| wxMerchantSubsidyService.exportData(wxMerchantSubsidy, request, response); | wxMerchantSubsidyService.exportData(wxMerchantSubsidy, request, response); | ||||
| } | } | ||||
| @@ -7,10 +7,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.dto.OrderSaveDto; | 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.domain.vo.WxOrderQueryVo; | ||||
| import com.iformall.enums.EnumCouponChannelStatus; | import com.iformall.enums.EnumCouponChannelStatus; | ||||
| import com.iformall.enums.EnumCouponChannelType; | import com.iformall.enums.EnumCouponChannelType; | ||||
| @@ -63,7 +60,7 @@ public class WxOrderController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxOrderController::list"); | logger.debug("[" + getIpAddr() + "] WxOrderController::list"); | ||||
| if (null == wxOrder) wxOrder = new WxOrder(); | if (null == wxOrder) wxOrder = new WxOrder(); | ||||
| wxOrder.setTenantId(getTenantId()); | 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<WxOrder> page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrder> page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -138,7 +138,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| } | } | ||||
| String tenantId = getTenantId(); | String tenantId = getTenantId(); | ||||
| wxCUserBasicInfo.setTenantId(tenantId); | wxCUserBasicInfo.setTenantId(tenantId); | ||||
| wxCUserBasicInfo.setSortColumns(WxCUserBasicInfo.Field.ActiveTime_DESC); | |||||
| wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); | |||||
| PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); | PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| @@ -228,7 +228,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| WxCouponOrder corder = new WxCouponOrder(); | WxCouponOrder corder = new WxCouponOrder(); | ||||
| corder.setCUserId(userId); | corder.setCUserId(userId); | ||||
| corder.setTenantId(getTenantId()); | corder.setTenantId(getTenantId()); | ||||
| corder.setSortColumns(CreateDate_DESC); | |||||
| corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); | PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); | ||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| List<WxCouponOrder> list = page.getList(); | List<WxCouponOrder> list = page.getList(); | ||||
| @@ -3,6 +3,7 @@ package com.iformall.controller.mem; | |||||
| import com.iformall.annotation.SystemControllerLog; | import com.iformall.annotation.SystemControllerLog; | ||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -45,7 +46,7 @@ public class WxLevelConfigController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); | logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); | ||||
| if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); | if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.setTenantId(getTenantId()); | wxLevelConfig.setTenantId(getTenantId()); | ||||
| wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); | |||||
| wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | |||||
| final PageInfo<WxLevelConfig> page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); | final PageInfo<WxLevelConfig> page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.annotation.SystemControllerLog; | import com.iformall.annotation.SystemControllerLog; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.WxBillAction; | import com.iformall.domain.po.WxBillAction; | ||||
| import com.iformall.service.WxBillActionService; | import com.iformall.service.WxBillActionService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| @@ -41,7 +42,7 @@ public class WxBillActionController extends BaseController { | |||||
| wxBillAction = new WxBillAction(); | wxBillAction = new WxBillAction(); | ||||
| } | } | ||||
| wxBillAction.setTenantId(getTenantId()); | wxBillAction.setTenantId(getTenantId()); | ||||
| wxBillAction.setSortColumns(WxBillAction.Field.Id_DESC); | |||||
| wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); | |||||
| PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import com.iformall.domain.po.WxBillRent; | import com.iformall.domain.po.WxBillRent; | ||||
| import com.iformall.service.WxBillRentService; | import com.iformall.service.WxBillRentService; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -39,7 +40,7 @@ public class WxBillRentController extends BaseController { | |||||
| wxBillRent = new WxBillRent(); | wxBillRent = new WxBillRent(); | ||||
| } | } | ||||
| wxBillRent.setTenantId(getTenantId()); | 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<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -146,6 +146,9 @@ public class BaseEntity implements Serializable { | |||||
| ReportTime_ASC("`reportTime` ASC"), | ReportTime_ASC("`reportTime` ASC"), | ||||
| ReportTime_DESC("`reportTime` DESC"), | ReportTime_DESC("`reportTime` DESC"), | ||||
| ActiveTime_ASC("`active_time` ASC"), | |||||
| ActiveTime_DESC("`active_time` DESC"), | |||||
| TopTime_ASC("`top_time` ASC"), | TopTime_ASC("`top_time` ASC"), | ||||
| TopTime_DESC("`top_time` DESC"), | TopTime_DESC("`top_time` DESC"), | ||||