xhxu 5 лет назад
Родитель
Сommit
ede8221e5e
2 измененных файлов: 24 добавлений и 0 удалений
  1. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  2. +15
    -0
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 9
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java Просмотреть файл

@@ -214,4 +214,13 @@ public class WxBillRent extends TenantEntity {
return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString();
}


@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;

}

+ 15
- 0
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Просмотреть файл

@@ -133,6 +133,21 @@
<if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if>
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}
</if>
<if test=" null != building or null != floor">
and br.`merchant_id` in(
select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms
inner join wx_merchant m on ms.merchant_id = m.id
inner join wx_shop s on s.id=ms.shop_id
where s.is_del=0
<if test=" null != building ">
and s.`building`= #{building}
</if>
<if test=" null != floor">
and s.`floor` = #{floor}
</if>
)

</if>
</where>
<if test=" null != sortColumns">order by ${sortColumns}</if>



Загрузка…
Отмена
Сохранить