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

[日常费用合同][修改][业务逻辑]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
5950d4412a
3 измененных файлов: 6 добавлений и 5 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  2. +4
    -3
      mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Просмотреть файл

@@ -76,7 +76,7 @@ public class WxBillDaily implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private Integer owe;
/*账单状态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;
/*删除 是1否0**/
@io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel")


+ 4
- 3
mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java Просмотреть файл

@@ -7,9 +7,10 @@ package com.iformall.enums;

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) {


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

@@ -57,7 +57,7 @@
<select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultType="hashmap">
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.`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
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


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