diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index b1f778394..b72248438 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -75,10 +75,6 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_msg_record".equals(tableName)) { return true; } - - if ("wx_coupon".equals(tableName)) { - return true; - } return false; } @@ -92,8 +88,6 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxShopMapper.rentRateHistory".equals(ms.getId())) return true; - if ("com.iformall.mapper.WxCouponMapper.findCouponData".equals(ms.getId())) - return true; return false; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 3ebc3dbde..5e961249e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -1,7 +1,9 @@ package com.iformall.domain.dto; +import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; +import javax.persistence.Transient; import java.util.Date; /** @@ -17,6 +19,14 @@ public class MarkingCouponDataReportDto extends BaseEntity{ private String tenantId; private Integer channelType; + @Transient + @SortColumn(column = "xTime") + private String xTime; + @Transient + @SortColumn(column = "sendCount") + private Integer sendCount; + + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index fe4d513dc..f0f2359b0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -49,9 +49,9 @@ public class BaseEntity implements Serializable { break; } } -// if(!find) { -// return sortColumn; -// } + if(!find) { + return null; + } //默认驼峰解析 return underscoreName(sortColumn) +" "+sortOrder; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 9b23a9f8e..338eac98b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -286,6 +286,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public PageInfo getSceneDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto(); + org.springframework.beans.BeanUtils.copyProperties(markingCouponDataReportDto, queryDto); queryDto.setTenantId(tenantId); HashMap params = new HashMap<>(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 797d3e21e..67302f9ea 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -125,7 +125,7 @@ and create_time <= #{endTime} - group by xTime + group by xTime order by ${sortColumns} order by xTime desc diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4bf4460a0..faf87026c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -606,34 +606,6 @@ order by ${sortColumns} order by c.status asc,c.create_date desc -