diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index b5537a8bd..76095e9fa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -40,7 +40,7 @@ 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.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, s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo from ( @@ -206,7 +206,7 @@ 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, - 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.depositOwe/100,2) depositOwe,round(bill.otherOwe/100,2) otherOwe, round((bill.rentOwe+bill.propertyOwe+bill.depositOwe+bill.otherOwe)/100,2) totalOwe