| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.domain.dto; | package com.iformall.domain.dto; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| @@ -8,7 +9,7 @@ import java.util.Date; | |||||
| * Created by syf on 2018/8/30. | * Created by syf on 2018/8/30. | ||||
| */ | */ | ||||
| @Data | @Data | ||||
| public class WxOrderReportDto { | |||||
| public class WxOrderReportDto extends BaseEntity{ | |||||
| private String tenantId; | private String tenantId; | ||||
| private Long merchantId; | private Long merchantId; | ||||
| private String merchantName; | private String merchantName; | ||||
| @@ -12,9 +12,8 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_property") | @Table(name = "wx_bill_property") | ||||
| public class WxBillProperty implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxBillProperty extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -29,10 +28,6 @@ public class WxBillProperty implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -12,9 +12,8 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_rent") | @Table(name = "wx_bill_rent") | ||||
| public class WxBillRent implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxBillRent extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -29,10 +28,7 @@ public class WxBillRent implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -3,7 +3,6 @@ package com.iformall.domain.po; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.io.Serializable; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -12,9 +11,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_brand") | @Table(name = "wx_brand") | ||||
| public class WxBrand implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxBrand extends BaseEntity{ | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -29,10 +26,7 @@ public class WxBrand implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -13,9 +13,8 @@ import java.util.Map; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_property_contract") | @Table(name = "wx_property_contract") | ||||
| public class WxPropertyContract implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxPropertyContract extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -35,10 +34,7 @@ public class WxPropertyContract implements Serializable { | |||||
| public void setId(Long id) { | public void setId(Long id) { | ||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -13,9 +13,7 @@ import java.util.Map; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_rent_contract") | @Table(name = "wx_rent_contract") | ||||
| public class WxRentContract implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxRentContract extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -32,10 +30,6 @@ public class WxRentContract implements Serializable { | |||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | public List<Long> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -1,14 +1,12 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import io.swagger.models.auth.In; | |||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import java.util.List; | import java.util.List; | ||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| public class WxBillAll { | |||||
| public class WxBillAll extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") | @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") | ||||
| private String appId; | private String appId; | ||||
| @@ -1,15 +1,12 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import com.iformall.domain.po.BaseEntity; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.io.Serializable; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| public class WxMerchantTradeDailyVo implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxMerchantTradeDailyVo extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -26,10 +23,6 @@ public class WxMerchantTradeDailyVo implements Serializable { | |||||
| this.id = id; | this.id = id; | ||||
| } | } | ||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | public List<String> getIds() { | ||||
| return ids; | return ids; | ||||
| } | } | ||||
| @@ -100,9 +100,10 @@ | |||||
| <if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if> | <if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if> | ||||
| <if test=" null != status ">and bill.`status` = #{status}</if> | <if test=" null != status ">and bill.`status` = #{status}</if> | ||||
| <if test=" null != rentShopType ">and bill.rent_shop_type = #{rentShopType}</if> | <if test=" null != rentShopType ">and bill.rent_shop_type = #{rentShopType}</if> | ||||
| order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns"> order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc </if> | |||||
| </select> | </select> | ||||
| @@ -553,6 +554,8 @@ | |||||
| left join wx_merchant_shop ms on ms.`merchant_id` = m.id | left join wx_merchant_shop ms on ms.`merchant_id` = m.id | ||||
| left join wx_shop ws on ms.`shop_id` = ws.id | left join wx_shop ws on ms.`shop_id` = ws.id | ||||
| where m.status=1 and m.tenant_id = #{tenantId} | where m.status=1 and m.tenant_id = #{tenantId} | ||||
| order by totalOwe desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns"> order by totalOwe desc </if> | |||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||
| @@ -487,7 +487,9 @@ | |||||
| <if test=" null != merchantName "> | <if test=" null != merchantName "> | ||||
| and wm.name like concat('%', #{merchantName},'%') | and wm.name like concat('%', #{merchantName},'%') | ||||
| </if> | </if> | ||||
| order by wm.create_date desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns"> order by wm.create_date desc </if> | |||||
| </select> | </select> | ||||
| <resultMap id="orderMap" type="com.iformall.domain.po.WxOrder"> | <resultMap id="orderMap" type="com.iformall.domain.po.WxOrder"> | ||||
| @@ -131,7 +131,9 @@ | |||||
| <if test=" null != rentShopType">and rc.`rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType">and rc.`rent_shop_type` = #{rentShopType}</if> | ||||
| </where> | </where> | ||||
| order by rc.id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns">order by rc.id desc</if> | |||||
| </select> | </select> | ||||
| <select id="queryRentContractWaitSignStatus" resultType="int" | <select id="queryRentContractWaitSignStatus" resultType="int" | ||||
| @@ -134,7 +134,9 @@ | |||||
| <if test=" null != rentShopType ">and rc.`rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType ">and rc.`rent_shop_type` = #{rentShopType}</if> | ||||
| </where> | </where> | ||||
| order by rc.id desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null == sortColumns"> order by rc.id desc </if> | |||||
| </select> | </select> | ||||
| <select id="queryRentContractWaitSignStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="queryRentContractWaitSignStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract"> | ||||