Bläddra i källkod

排序 bug

release_toaliyun_real
xhxu 5 år sedan
förälder
incheckning
5e00cfa0f1
6 ändrade filer med 25 tillägg och 13 borttagningar
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +6
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  3. +6
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
  4. +3
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  5. +6
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  6. +1
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Visa fil

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

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

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);
return new ResultData(page);


+ 6
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Visa fil

@@ -74,7 +74,9 @@ public class WxCouponController extends BaseController {
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
String coryColumn = "c."+wxCoupon.getSortColumns();
wxCoupon.setSortColumn(coryColumn);
wxCoupon.setSortColumn(null);
}
if(wxCoupon.getTargetAd() != null && wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()){
Integer[] typeArray = {
@@ -111,7 +113,9 @@ public class WxCouponController extends BaseController {

wxCoupon.setTypes(Arrays.asList(typeArray));
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
String coryColumn = "c."+wxCoupon.getSortColumns();
wxCoupon.setSortColumn(coryColumn);
wxCoupon.setSortColumn(null);
}
return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表
}


+ 6
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java Visa fil

@@ -54,10 +54,14 @@ 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.CCUpdateDate_DESC);

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


+ 3
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Visa fil

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

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);
return new ResultData(page);


+ 6
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java Visa fil

@@ -71,7 +71,9 @@ public class WxCouponController extends BaseController {
wxCoupon.setMerchantId(getLoginBUser().getMerchantId());

if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
String coryColumn = "c."+wxCoupon.getSortColumns();
wxCoupon.setSortColumn(coryColumn);
wxCoupon.setSortColumn(null);
}

return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表
@@ -99,7 +101,9 @@ public class WxCouponController extends BaseController {
wxCoupon.setTypes(Arrays.asList(typeArray));
wxCoupon.setMerchantId(getLoginBUser().getMerchantId());
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
String coryColumn = "c."+wxCoupon.getSortColumns();
wxCoupon.setSortColumn(coryColumn);
wxCoupon.setSortColumn(null);
}
return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表
}


+ 1
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Visa fil

@@ -56,9 +56,7 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
// String coryColumn = "c."+wxCouponChannel.getSortColumns();
// wxCouponChannel.setSortColumns(coryColumn);
// wxCouponChannel.setSortColumn(null);

}else{
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);
}


Laddar…
Avbryt
Spara