| @@ -40,7 +40,7 @@ | |||||
| bill.id,bill.tenant_id tenantId,bill.merchant_id merchantId,bill.shop_id shopId, | 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.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.receive_pay receivePay,bill.pay,bill.owe,bill.receive_date receiveDate, | ||||
| bill.pay_date payDate,bill.expired_day expiredDay,bill.status,bill.starttime, | |||||
| bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status,bill.starttime, | |||||
| bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName, | 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 | s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo | ||||
| from ( | from ( | ||||
| @@ -206,7 +206,7 @@ | |||||
| <select id="listData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll"> | <select id="listData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll"> | ||||
| select bill.id,bill.merchant_id merchantId,bill.shop_id shopId,bill.bill_type_value billTypeValue,bill.bill_type billType,bill.need_pay needPay, | select bill.id,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.receive_pay receivePay,bill.pay,bill.owe,bill.receive_date receiveDate,bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status, | |||||
| bill.tenant_id tenantId,m.name merchantName,s.shop_number shopNumber,bill.starttime,bill.endtime,bill.name,pb.pay_bill_status payBillStatus, | bill.tenant_id tenantId,m.name merchantName,s.shop_number shopNumber,bill.starttime,bill.endtime,bill.name,pb.pay_bill_status payBillStatus, | ||||
| pb.pay_time_end tradeTime,pb.transaction_id transactionId,pb.pay_amount payAmount,bill.rent_shop_type | pb.pay_time_end tradeTime,pb.transaction_id transactionId,pb.pay_amount payAmount,bill.rent_shop_type | ||||
| rentShopType from ( | rentShopType from ( | ||||
| @@ -436,7 +436,8 @@ | |||||
| </select> | </select> | ||||
| <select id="getOweBillForEmail" resultType="hashmap"> | <select id="getOweBillForEmail" resultType="hashmap"> | ||||
| select bill.tenant_id tenantId,bill.merchant_id merchantId,bill.bill_type billType,bill.owe owe,m.link_phone managerPhone,m.`link_person` manager,m.email,app.appname,bill.receive_date receiveDate,bill.expired_day expiredDay from ( | |||||
| select bill.tenant_id tenantId,bill.merchant_id merchantId,bill.bill_type billType,bill.owe owe,m.link_phone managerPhone,m.`link_person` manager,m.email,app.appname,bill.receive_date receiveDate | |||||
| ,DATEDIFF(now(),bill.receive_date) expiredDay from ( | |||||
| select bill.tenant_id,bill.merchant_id,bill.bill_type,sum(owe) owe,bill.receive_date,bill.expired_day from ( | select bill.tenant_id,bill.merchant_id,bill.bill_type,sum(owe) owe,bill.receive_date,bill.expired_day from ( | ||||
| select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' | select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' | ||||
| @@ -486,7 +487,7 @@ | |||||
| <select id="getOweBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | <select id="getOweBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | ||||
| select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, | select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, | ||||
| m.link_phone managerPhone,m.`link_person` manager,m.email, | m.link_phone managerPhone,m.`link_person` manager,m.email, | ||||
| bill.receive_date receiveDate,bill.expired_day expiredDay,ws.building,ws.floor, | |||||
| bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,ws.building,ws.floor, | |||||
| round(bill.rentOwe/100,2) rentOwe,round(bill.propertyOwe/100,2) propertyOwe, | round(bill.rentOwe/100,2) rentOwe,round(bill.propertyOwe/100,2) propertyOwe, | ||||
| round(bill.depositOwe/100,2) depositOwe,round(bill.otherOwe/100,2) otherOwe, | round(bill.depositOwe/100,2) depositOwe,round(bill.otherOwe/100,2) otherOwe, | ||||
| round((bill.rentOwe+bill.propertyOwe+bill.depositOwe+bill.otherOwe)/100,2) totalOwe | round((bill.rentOwe+bill.propertyOwe+bill.depositOwe+bill.otherOwe)/100,2) totalOwe | ||||