Browse Source

[租赁合同][修改][添加预账单备注字段]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
24fa9da2d0
4 changed files with 32 additions and 4 deletions
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  3. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  4. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java View File

@@ -128,6 +128,17 @@ public class WxBillProperty implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus") @io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
private Integer latePayStatus; private Integer latePayStatus;


@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments;

public String getComments() {
return comments;
}

public void setComments(String comments) {
this.comments = comments;
}

public Integer getLatePayStatus() { public Integer getLatePayStatus() {
return latePayStatus; return latePayStatus;
} }


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java View File

@@ -131,6 +131,17 @@ public class WxBillRent implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus") @io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
private Integer latePayStatus; private Integer latePayStatus;


@io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments")
private String comments;

public String getComments() {
return comments;
}

public void setComments(String comments) {
this.comments = comments;
}

public Integer getLatePayStatus() { public Integer getLatePayStatus() {
return latePayStatus; return latePayStatus;
} }


+ 5
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml View File

@@ -29,6 +29,7 @@
<result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/>
<result column="pay_way" jdbcType="INTEGER" property="payWay"/> <result column="pay_way" jdbcType="INTEGER" property="payWay"/>
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/> <result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/>
</resultMap> </resultMap>
@@ -37,7 +38,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`
`pay_way`,`late_pay_status`,`comments`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -90,7 +91,8 @@
else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end) else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end)
else br.late_pay_price end latePayPrice, else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_property where property_contract_id=br.property_contract_id) (select max(period) from wx_bill_property where property_contract_id=br.property_contract_id)
allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
br.`comments`
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id left join wx_shop s on br.shop_id=s.id
left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id
@@ -156,6 +158,7 @@
<update id="update" parameterType="com.iformall.domain.po.WxBillProperty"> <update id="update" parameterType="com.iformall.domain.po.WxBillProperty">
update wx_bill_property set updatetime = now() update wx_bill_property set updatetime = now()
<if test=" null != receivePay ">,receive_pay = #{receivePay},owe=#{receivePay}</if> <if test=" null != receivePay ">,receive_pay = #{receivePay},owe=#{receivePay}</if>
<if test=" null != comments ">,comments = #{comments}</if>
where id = #{id} where id = #{id}
</update> </update>




+ 5
- 2
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -29,6 +29,7 @@
<result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> <result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/>
<result column="pay_way" jdbcType="INTEGER" property="payWay"/> <result column="pay_way" jdbcType="INTEGER" property="payWay"/>
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/> <result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/>
</resultMap> </resultMap>
@@ -37,7 +38,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`
`pay_way`,`late_pay_status`,`comments`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -93,7 +94,8 @@
else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end) else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end)
else br.late_pay_price end latePayPrice, else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status` (select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status`
depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
br.`comments`
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id left join wx_shop s on br.shop_id=s.id
left join wx_rent_contract r on br.rent_contract_id=r.id left join wx_rent_contract r on br.rent_contract_id=r.id
@@ -154,6 +156,7 @@
<update id="update" parameterType="com.iformall.domain.po.WxBillRent"> <update id="update" parameterType="com.iformall.domain.po.WxBillRent">
update wx_bill_rent set updatetime = now() update wx_bill_rent set updatetime = now()
<if test=" null != receivePay ">,receive_pay = #{receivePay},owe=#{receivePay}</if> <if test=" null != receivePay ">,receive_pay = #{receivePay},owe=#{receivePay}</if>
<if test=" null != comments ">,comments = #{comments}</if>
where id = #{id} where id = #{id}
</update> </update>




Loading…
Cancel
Save