diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 745ff8d05..6ddab10f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -23,6 +23,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,6 +67,11 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } + final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 9fc6a9493..57951886c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +69,9 @@ public class WxCouponController extends BaseController { if(null == wxCoupon.getSourceType()){ wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); } + if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ + wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + } return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } @@ -91,6 +95,9 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_PRESS.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); + if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ + wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + } return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index 9a5d1f970..d2df602d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -54,7 +54,11 @@ public class MemCouponController extends BaseController { wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } final PageInfo page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 121ac3ea1..94213295b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -60,6 +61,10 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setMerchantId(getUser().getMerchantId()); wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index e47b9246e..d949bf301 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,6 +67,11 @@ public class WxCouponController extends BaseController { wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); } wxCoupon.setMerchantId(getUser().getMerchantId()); + + if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ + wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + } + return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } @@ -88,6 +94,10 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_PRESS.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); + wxCoupon.setMerchantId(getUser().getMerchantId()); + if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ + wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + } return wxCouponService.list(wxCoupon, 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 e297af145..6287be36e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.Map; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +56,11 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java index d0043be80..e0ae7d218 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java @@ -137,6 +137,9 @@ public class BaseEntity implements Serializable { CId_ASC("c.`id` ASC"), CId_DESC("c.`id` DESC"), + CCId_ASC("cc.`id` ASC"), + CCId_DESC("cc.`id` DESC"), + CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 76bc45b5a..79a12e863 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -152,7 +152,7 @@ , - c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price, + c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price, c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions, c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type