Просмотр исходного кода

[账单总览][修改][列表查询]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
4e1c89d33a
2 измененных файлов: 54 добавлений и 38 удалений
  1. +33
    -24
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
  2. +21
    -14
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 33
- 24
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java Просмотреть файл

@@ -9,56 +9,65 @@ import java.util.Date;
* @author gongbiao
*/
public class WxBillAllVo {
Long id;
private Long id;

String tenantId;
private String tenantId;

Long merchantId;
private Long merchantId;

Long shopId;
private Long shopId;

//@Excel(name="商铺号",width = 20,orderNum = "1")
String shopNumber;
private String shopNumber;

//@Excel(name="商户名称",width = 20,orderNum = "2")
String merchantName;
private String merchantName;

//@Excel(name="商铺类型",width = 20,orderNum = "3", replace = {"店铺_1","多经点位_2"})
Integer rentShopType;
private Integer rentShopType;

@Excel(name="费用类型",width = 20,orderNum = "4")
String billType;
private String billType;

@Excel(name="实际应收金额(元)",width = 20,orderNum = "5")
String receivePayStr;
private String receivePayStr;

@Excel(name="实收金额(元)",width = 20,orderNum = "6")
String payStr;
private String payStr;

@Excel(name="欠缴金额(元)",width = 20,orderNum = "7")
String oweStr;
private String oweStr;

@Excel(name="缴款截止日期",width = 20,orderNum = "8", format="yyyy-MM-dd")
Date receiveDate;
private Date receiveDate;

@Excel(name="逾期天数",width = 20,orderNum = "9")
Integer expiredDay;
private Integer expiredDay;

@Excel(name="账单状态",width = 20,orderNum = "10", replace = {"欠缴_1","待缴_2","已结清_3","未到期_4","已退还_5","失效_6"})
Integer status;
private Integer status;

Integer billTypeValue;
Integer needPay;
Integer receivePay;
Integer pay;
Integer owe;
Date payDate;
Date starttime;
Date endtime;
private Integer billTypeValue;
private Integer needPay;
private Integer receivePay;
private Integer pay;
private Integer owe;
private Date payDate;
private Date starttime;
private Date endtime;

String manager;
String managerPhone;
private String manager;
private String managerPhone;

private String shopInfo;

public String getShopInfo() {
return shopInfo;
}

public void setShopInfo(String shopInfo) {
this.shopInfo = shopInfo;
}

public Long getId() {
return id;


+ 21
- 14
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -30,6 +30,8 @@
<result column="shopNumber" jdbcType="VARCHAR" property="shopNumber"/>
<result column="manager" jdbcType="VARCHAR" property="manager"/>
<result column="managerPhone" jdbcType="VARCHAR" property="managerPhone"/>
<result column="shopInfo" jdbcType="VARCHAR" property="shopInfo"/>
</resultMap>


@@ -37,42 +39,47 @@
select
bill.id,bill.tenant_id tenantId,bill.merchant_id merchantId,bill.shop_id shopId,
bill.bill_type_value billTypeValue,bill.bill_type billType,bill.need_pay needPay,
bill.receive_pay receivePay,bill.pay,bill.owe,bill.receive_date receiveDate,bill.pay_date payDate,
bill.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
from (
bill.receive_pay receivePay,bill.pay,bill.owe,bill.receive_date receiveDate,
bill.pay_date payDate,bill.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
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 from wx_bill_rent where is_preview = 0
endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info
from wx_bill_rent where is_preview = 0
union
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,''
endtime,rent_shop_type from wx_bill_rent_deposit
endtime,rent_shop_type,'[]' shop_info from wx_bill_rent_deposit
union
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 from wx_bill_property where is_preview = 0
endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info
from wx_bill_property where is_preview = 0
union
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 from wx_bill_property_deposit
endtime,rent_shop_type,'[]' shop_info from wx_bill_property_deposit
union
select id,merchant_id,shop_id,tenant_id,'水费' name,5 bill_type_value,'水费' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
from wx_bill_daily where type=1
union
select id,merchant_id,shop_id,tenant_id,'电费' name,6 bill_type_value,'电费' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
from wx_bill_daily where type=2
union
select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,'其他' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
from wx_bill_other
union
select id,merchant_id,shop_id,tenant_id,name,8 bill_type_value,'其他押金' bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,
rent_shop_type,'[]' shop_info
from wx_bill_other_deposit
) bill
left join wx_merchant m on bill.merchant_id=m.id


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