Browse Source

[账单][修改][为租赁账单和物业账单添加滞纳金状态字段]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
fdf183bfcc
5 changed files with 38 additions and 4 deletions
  1. +5
    -0
      mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  3. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  4. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  5. +5
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 5
- 0
mallinkAdmin/src/main/resources/db/migration/V201904151140__UPDATE_BILL_RENT.sql View File

@@ -0,0 +1,5 @@
alter table wx_bill_rent
add column `late_pay_status` smallint(2) default 2 COMMENT '滞纳金状态(使用账单的状态)';

alter table wx_bill_property
add column `late_pay_status` smallint(2) default 2 COMMENT '滞纳金状态(使用账单的状态)';

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

@@ -125,6 +125,17 @@ public class WxBillProperty implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay; private Integer payWay;


@io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
private Integer latePayStatus;

public Integer getLatePayStatus() {
return latePayStatus;
}

public void setLatePayStatus(Integer latePayStatus) {
this.latePayStatus = latePayStatus;
}

public Integer getPayWay() { public Integer getPayWay() {
return payWay; return payWay;
} }


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

@@ -127,6 +127,18 @@ public class WxBillRent implements Serializable {
@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay; private Integer payWay;



@io.swagger.annotations.ApiModelProperty(value = "滞纳金状态", name = "latePayStatus")
private Integer latePayStatus;

public Integer getLatePayStatus() {
return latePayStatus;
}

public void setLatePayStatus(Integer latePayStatus) {
this.latePayStatus = latePayStatus;
}

public Integer getPayWay() { public Integer getPayWay() {
return payWay; return payWay;
} }


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

@@ -28,6 +28,7 @@
<result column="is_preview" property="isPreview"/> <result column="is_preview" property="isPreview"/>
<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"/>
</resultMap> </resultMap>
@@ -36,7 +37,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`
`pay_way`,`late_pay_status`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -62,6 +63,7 @@
<if test=" null == isPreview ">and is_preview = 0</if> <if test=" null == isPreview ">and is_preview = 0</if>
<if test=" null != isPreview ">and is_preview = #{isPreview}</if> <if test=" null != isPreview ">and is_preview = #{isPreview}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if> <if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>


<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
@@ -87,7 +89,7 @@
else else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) 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
allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
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
@@ -103,6 +105,7 @@
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if> <if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
</where> </where>
<if test=" null != sortColumns">order by br.${sortColumns}</if> <if test=" null != sortColumns">order by br.${sortColumns}</if>


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

@@ -28,6 +28,7 @@
<result column="is_preview" property="isPreview"/> <result column="is_preview" property="isPreview"/>
<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"/>
</resultMap> </resultMap>
@@ -36,7 +37,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`
`pay_way`,`late_pay_status`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -62,6 +63,7 @@
<if test=" null == isPreview ">and is_preview = 0</if> <if test=" null == isPreview ">and is_preview = 0</if>
<if test=" null != isPreview ">and is_preview = #{isPreview}</if> <if test=" null != isPreview ">and is_preview = #{isPreview}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if> <if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>


<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
@@ -89,7 +91,7 @@
br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) 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
depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
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
@@ -106,6 +108,7 @@
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
</where> </where>
<if test=" null != sortColumns">order by br.${sortColumns}</if> <if test=" null != sortColumns">order by br.${sortColumns}</if>


Loading…
Cancel
Save