diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
index 4e01afa4d..382164387 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
@@ -68,6 +68,9 @@ public class WxBillAllVo {
@io.swagger.annotations.ApiModelProperty(value = "评论", name = "comments")
private String comments;
+ @io.swagger.annotations.ApiModelProperty(value = "明细", name = "priceDetail")
+ private String priceDetail;
+
public String getReceivePayStr() {
if(getReceivePay()!=null) {
receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString();
diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
index fcb118f17..b54caab03 100644
--- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
@@ -35,7 +35,10 @@
-
+
+
+
+
@@ -48,11 +51,13 @@
,bill.receive_date receiveDate,
bill.pay_date payDate,expired_day expiredDay,bill.status,bill.starttime,
bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName,
- s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo,bill.comments
+ s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info
+ shopInfo,bill.comments,bill.price_detail
from (
select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
- endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments
+ endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments,''
+ price_detail
from wx_bill_rent where tenant_id=#{tenantId} and is_preview = 0
union all
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金'
@@ -61,29 +66,31 @@
union all
select id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
- endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments
+ endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments,''
+ price_detail
from wx_bill_property where tenant_id=#{tenantId} and is_preview = 0
union all
select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
- endtime,rent_shop_type,shop_info,NULL comments from wx_bill_property_deposit where tenant_id=#{tenantId}
+ endtime,rent_shop_type,shop_info,NULL comments,'' price_detail from wx_bill_property_deposit where
+ tenant_id=#{tenantId}
union all
select id,merchant_id,shop_id,tenant_id,case when type=1 then '水费' when type=2 then '电费' else '空调费' end name,
case when type=1 then 5 when type=2 then 6 else 9 end bill_type_value,
case when type=1 then '水费' when type=2 then '电费' else '空调费' end bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime,
- rent_shop_type,'[]' shop_info,price_detail as comments
+ rent_shop_type,'[]' shop_info, NULL comments,price_detail
from wx_bill_daily where tenant_id=#{tenantId}
union all
select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,concat('其他费用-',name) as bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
- rent_shop_type,'[]' shop_info,comments
+ rent_shop_type,'[]' shop_info,comments,'' price_detail
from wx_bill_other where tenant_id=#{tenantId}
union all
select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as
bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
- rent_shop_type,'[]' shop_info,comments
+ rent_shop_type,'[]' shop_info,comments,'' price_detail
from wx_bill_other_deposit where tenant_id=#{tenantId}
) bill
left join wx_merchant m on bill.merchant_id=m.id