From 3a94a8df338e6112a591c147cc2b95940c6fb4ad Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 22 Aug 2019 16:48:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=B9=E8=B4=A6][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=85=B1=E7=94=A8=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxBillAll.java | 3 +++ .../com/iformall/service/impl/WxBillAllServiceImpl.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index a1729c9c0..438167ce9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -140,4 +140,7 @@ public class WxBillAll extends BaseEntity { @Transient private Integer balance; + @io.swagger.annotations.ApiModelProperty(value = "多个状态", name = "statusStr") + private String statusStr; + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 9a377d4c7..fe703c0fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -120,13 +121,17 @@ public class WxBillAllServiceImpl implements WxBillAllService { public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { //更新各账单状态 //updateBillStatus(record); + + if (StringUtils.isNotEmpty(record.getStatusStr())) { + List typeList = JSONArray.parseArray(record.getStatusStr(), Integer.class); + record.setTypeList(typeList); + } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillAllMapper.list(record)); Map result = new HashMap<>(); result.put("pageInfo", pageInfo); return result; } - @Override public List> listBillOweAndWaitPay(WxBillAll wxBillAll) { //更新各账单状态