diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 24db9dd32..f0064bf9d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -52,8 +52,8 @@ public class WxBillSettle extends BaseEntity { private Map flowParams; @Transient - private List receiveBillIds; + private List receiveBillIds; @Transient - private List payBillIds; + private List payBillIds; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java new file mode 100644 index 000000000..0323776a6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -0,0 +1,41 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +/** + * @author luozukai + */ +@Table(name = "wx_bill_settle_bill") +@Data +@EqualsAndHashCode(callSuper = true) +public class WxBillSettleBill extends BaseEntity { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value="结算单id",name="settleId") + private Long settleId; + @io.swagger.annotations.ApiModelProperty(value="类型: 0收款1承付",name="type") + private Integer type; + @io.swagger.annotations.ApiModelProperty(value="账单id",name="billId") + private Long billId; + @io.swagger.annotations.ApiModelProperty(value="账单类型: 1租金2押金3物业4水费5电费6其他7空调费",name="billType") + private Integer billType; + + + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") + private Date createtime; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") + private Date updatetime; + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java new file mode 100644 index 000000000..88a84c11b --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java @@ -0,0 +1,17 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxBillSettleBill; +import java.util.List; + +/** + * @author luozukai + */ +public interface WxBillSettleBillMapper extends CommonMapper { + + List findList(WxBillSettleBill wxBillSettleBill); + + void update(WxBillSettleBill record); + + +} diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml new file mode 100644 index 000000000..1bd2b02d1 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type` + ,`createtime`,`updatetime` + + + + where 1=1 + and `id` = #{id} + and `tenant_id` = #{tenantId} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + +