diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index 8b98d5f15..1c10d2def 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -1,5 +1,6 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.BaseEntity; import lombok.Data; import java.util.Date; @@ -8,7 +9,7 @@ import java.util.Date; * Created by syf on 2018/8/30. */ @Data -public class WxOrderReportDto { +public class WxOrderReportDto extends BaseEntity{ private String tenantId; private Long merchantId; private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index d342b6fa5..f8de2a5dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -12,9 +12,8 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_property") -public class WxBillProperty implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillProperty extends BaseEntity { + @Id protected Long id; @@ -29,10 +28,6 @@ public class WxBillProperty implements Serializable { public void setId(Long id) { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 5a2ad5ed9..5e21be0ba 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -12,9 +12,8 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_rent") -public class WxBillRent implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillRent extends BaseEntity { + @Id protected Long id; @@ -29,10 +28,7 @@ public class WxBillRent implements Serializable { public void setId(Long id) { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - + public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index e2c222a98..8fd4f64a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -3,7 +3,6 @@ package com.iformall.domain.po; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -12,9 +11,7 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_brand") -public class WxBrand implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBrand extends BaseEntity{ @Id protected Long id; @@ -29,10 +26,7 @@ public class WxBrand implements Serializable { public void setId(Long id) { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - + public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index d86c04bb1..a132fb3f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -13,9 +13,8 @@ import java.util.Map; * @author gongbiao */ @Table(name = "wx_property_contract") -public class WxPropertyContract implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxPropertyContract extends BaseEntity { + @Id protected Long id; @@ -35,10 +34,7 @@ public class WxPropertyContract implements Serializable { public void setId(Long id) { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - + public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 7d6655f16..389bab0cf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -13,9 +13,7 @@ import java.util.Map; * @author gongbiao */ @Table(name = "wx_rent_contract") -public class WxRentContract implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxRentContract extends BaseEntity { @Id protected Long id; @@ -32,10 +30,6 @@ public class WxRentContract implements Serializable { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 5c6400c49..25fcc17a7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -1,14 +1,12 @@ package com.iformall.domain.vo; -import io.swagger.models.auth.In; - +import com.iformall.domain.po.BaseEntity; import java.util.List; /** * @author gongbiao */ -public class WxBillAll { - +public class WxBillAll extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") private String appId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 110821fa9..e5b1ca475 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -1,15 +1,12 @@ package com.iformall.domain.vo; +import com.iformall.domain.po.BaseEntity; import javax.persistence.Id; - import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; -public class WxMerchantTradeDailyVo implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxMerchantTradeDailyVo extends BaseEntity { @Id protected Long id; @@ -26,10 +23,6 @@ public class WxMerchantTradeDailyVo implements Serializable { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - public List getIds() { return ids; } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index d7a5a8e56..3f9e89548 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -100,9 +100,10 @@ and bill.bill_type_value = #{billTypeValue} and bill.`status` = #{status} and bill.rent_shop_type = #{rentShopType} - - order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc - + + order by ${sortColumns} + order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc + @@ -553,6 +554,8 @@ left join wx_merchant_shop ms on ms.`merchant_id` = m.id left join wx_shop ws on ms.`shop_id` = ws.id where m.status=1 and m.tenant_id = #{tenantId} - order by totalOwe desc + + order by ${sortColumns} + order by totalOwe desc diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index df0cc8c25..eb8f134b1 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -487,7 +487,9 @@ and wm.name like concat('%', #{merchantName},'%') - order by wm.create_date desc + order by ${sortColumns} + order by wm.create_date desc + diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 047b72128..3d6a6fc4f 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -131,7 +131,9 @@ and rc.`rent_shop_type` = #{rentShopType} - order by rc.id desc + + order by ${sortColumns} + order by rc.id desc