Просмотр исходного кода

b端商户发卷接口

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
fefd61fdd1
4 измененных файлов: 12 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Просмотреть файл

@@ -65,7 +65,7 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(null); wxCouponChannel.setStatus(null);
} }
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
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);
} }


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -59,7 +59,7 @@ public class WxCouponChannelController extends BaseController {
} }
wxCouponChannel.setMerchantId(getUser().getMerchantId()); wxCouponChannel.setMerchantId(getUser().getMerchantId());
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
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);
} }


+ 9
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java Просмотреть файл

@@ -134,9 +134,15 @@ public class BaseEntity implements Serializable {
Id_ASC("`id` ASC"), Id_ASC("`id` ASC"),
Id_DESC("`id` DESC"), Id_DESC("`id` DESC"),


CId_ASC("c.`id` ASC"),
CId_DESC("c.`id` DESC"),

CreateDate_ASC("`create_date` ASC"), CreateDate_ASC("`create_date` ASC"),
CreateDate_DESC("`create_date` DESC"), CreateDate_DESC("`create_date` DESC"),


CCreateDate_ASC("c.`create_date` ASC"),
CCreateDate_DESC("c.`create_date` DESC"),

SId_ASC("s.`id` ASC"), SId_ASC("s.`id` ASC"),
SId_DESC("s.`id` DESC"), SId_DESC("s.`id` DESC"),


@@ -146,6 +152,9 @@ public class BaseEntity implements Serializable {
UpdateDate_ASC("`update_date` ASC"), UpdateDate_ASC("`update_date` ASC"),
UpdateDate_DESC("`update_date` DESC"), UpdateDate_DESC("`update_date` DESC"),


CCUpdateDate_ASC("cc.`update_date` ASC"),
CCUpdateDate_DESC("cc.`update_date` DESC"),

Createtime_ASC("`createtime` ASC"), Createtime_ASC("`createtime` ASC"),
Createtime_DESC("`createtime` DESC"), Createtime_DESC("`createtime` DESC"),




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -85,7 +85,7 @@ public class WxCouponServiceImpl implements WxCouponService {
@Override @Override
public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
if (null == wxCoupon) wxCoupon = new WxCoupon(); if (null == wxCoupon) wxCoupon = new WxCoupon();
wxCoupon.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC);
wxCoupon.setSortColumns(BaseEntity.SortField.CCreateDate_DESC, BaseEntity.SortField.CId_DESC);
PageInfo<WxCoupon> page = null; PageInfo<WxCoupon> page = null;
if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1)
wxCoupon.setStatus(null); wxCoupon.setStatus(null);


Загрузка…
Отмена
Сохранить