Sfoglia il codice sorgente

排序 bug

release_toaliyun_real
xhxu 5 anni fa
parent
commit
9c686a932a
3 ha cambiato i file con 9 aggiunte e 7 eliminazioni
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +3
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  3. +3
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Vedi File

@@ -67,14 +67,15 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(null); wxCouponChannel.setStatus(null);
} }
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);


if(null == wxCouponChannel.getSourceType()){ if(null == wxCouponChannel.getSourceType()){
wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
} }


if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
//
}else{
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);
} }
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);


+ 3
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Vedi File

@@ -60,10 +60,11 @@ public class WxCouponChannelController extends BaseController {
} }
wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId()); wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId());
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);


if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
//
}else{
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);
} }
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);


+ 3
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Vedi File

@@ -55,10 +55,10 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());


wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
//
}else{
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);
} }
wxCouponChannel.setShowBeginTime(new Date()); wxCouponChannel.setShowBeginTime(new Date());
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);


Caricamento…
Annulla
Salva