Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
fa9927db35
16 changed files with 33 additions and 1 deletions
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  8. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java
  9. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  10. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  11. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  12. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  13. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  14. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  15. +2
    -1
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  16. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java View File

@@ -134,4 +134,7 @@ public class WxBillDaily extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java View File

@@ -102,4 +102,7 @@ public class WxBillDeposit extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java View File

@@ -166,5 +166,8 @@ public class WxBillOther extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;

}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java View File

@@ -169,4 +169,7 @@ public class WxBillOtherDeposit extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

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

@@ -234,4 +234,7 @@ public class WxBillProperty extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java View File

@@ -101,4 +101,7 @@ public class WxBillPropertyDeposit extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

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

@@ -286,5 +286,8 @@ public class WxBillRent extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;

}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java View File

@@ -221,5 +221,8 @@ public class WxBillRentManage extends TenantEntity {
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;

}

+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml View File

@@ -101,6 +101,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != buildWay ">and br.`build_way` = #{buildWay}</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml View File

@@ -123,6 +123,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml View File

@@ -107,6 +107,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml View File

@@ -102,6 +102,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml View File

@@ -113,6 +113,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != merchantIds ">
and br.`merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml View File

@@ -134,6 +134,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</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 != payWay ">and br.`pay_way` = #{payWay}</if>


+ 2
- 1
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml View File

@@ -119,7 +119,8 @@
<if test=" null != endtime">and br.`endtime` &gt;= #{endtime}</if>
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if>
<if test=" null != hasMerchant ">and br.`merchant_id` is not null</if>


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -140,6 +140,7 @@
<if test=" null != month and '' != month">
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null != onlyOwe">and br.`owe` &gt; 0</if>
<if test=" null != rentContractIdList ">
and br.`rent_contract_id` in
<foreach collection="rentContractIdList" index="index" item="ridItem" open="(" separator="," close=")">


Loading…
Cancel
Save