| @@ -76,7 +76,7 @@ public class WxBillDaily implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | private Integer owe; | ||||
| /*账单状态1待缴2欠缴3已结清**/ | /*账单状态1待缴2欠缴3已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="账单状态1待缴2欠缴3已结清",name="status") | |||||
| @io.swagger.annotations.ApiModelProperty(value="账单状态1未到期2待缴3欠缴4已结清",name="status") | |||||
| private Integer status; | private Integer status; | ||||
| /*删除 是1否0**/ | /*删除 是1否0**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel") | @io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel") | ||||
| @@ -7,9 +7,10 @@ package com.iformall.enums; | |||||
| public enum EnumBillDailyStatus { | public enum EnumBillDailyStatus { | ||||
| WAIT_PAY(1,"待缴"), | |||||
| NOT_PAID(2, "欠缴"), | |||||
| PAID(3, "已结清"), | |||||
| NOT_EXPIRED(1,"未到期"), | |||||
| WAIT_PAY(2,"待缴"), | |||||
| NOT_PAID(3, "欠缴"), | |||||
| PAID(4, "已结清"), | |||||
| ; | ; | ||||
| public static EnumBillDailyStatus getEnum(Integer code) { | public static EnumBillDailyStatus getEnum(Integer code) { | ||||
| @@ -57,7 +57,7 @@ | |||||
| <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultType="hashmap"> | <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultType="hashmap"> | ||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | ||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | ||||
| br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | |||||
| m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | |||||
| br.`merchant_id` merchantId | br.`merchant_id` merchantId | ||||
| from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | ||||
| left join wx_shop s on br.shop_id=s.id | left join wx_shop s on br.shop_id=s.id | ||||