From 2d70be56f35d3c4293fbe61381a338cab5ddddbe Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 15 Oct 2019 15:29:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=99=BB=E5=BD=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E8=A7=92?= =?UTF-8?q?=E8=89=B2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/sys/MallUserInfoController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 5cabed938..893c47208 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -291,6 +291,8 @@ public class MallUserInfoController extends BaseController { public ResultData getUserInfo() { ///logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); MallUserInfo info = getUser(); + MallUserRole userRole = userRoleService.getByUid(info.getId()); + info.setRoleId(userRole.getRoleId()); info.protectInfos(); return new ResultData(info); } From e82fefe7f9079be8d18ef7e568cb422d64a6eb73 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 15 Oct 2019 15:58:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E6=94=B9][=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=89=93=E6=A0=87=E7=AD=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCUserTagsServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 8e50eb6f1..3f8eaf204 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -762,10 +762,11 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId); WxCUserTags userTags = getById(wxCUserBasicInfo.getTagId()); List tagList = JSONArray.parseArray(userTags.getTags(), Long.class); - if (!tagList.isEmpty()) { - tagList.addAll(tags); - } - String tagStr = JSONArray.toJSONString(tagList); + Set set = new HashSet<>(); + set.addAll(tagList); + List tempList = new ArrayList<>(); + tempList.addAll(set); + String tagStr = JSONArray.toJSONString(tempList); userTags.setTags(tagStr); userTags.setUpdateDate(new Date()); wxCUserTagsMapper.updateById(userTags); From 8a6811886d2b647547ec791e3dd459f64aa99c39 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 15 Oct 2019 16:18:22 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9][=E5=BC=80=E5=8F=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxBillAll.java | 9 ++++ .../service/impl/WxBillAllServiceImpl.java | 41 +++++++++++++------ .../service/impl/WxBillDailyServiceImpl.java | 4 +- .../main/resources/mapper/WxBillAllMapper.xml | 27 +++++++----- 4 files changed, 57 insertions(+), 24 deletions(-) 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 4d310d355..8fb4b02e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -152,4 +152,13 @@ public class WxBillAll extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "多个类型", name = "typeStr") private String typeStr; + + @TableField(exist = false) + private Integer servicePayRate; + + @TableField(exist = false) + private Integer limitStart; + @TableField(exist = false) + private Integer limitEnd; + } 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 29f5ea41a..5ce01abc3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1719,19 +1719,36 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { - PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); - pageInfo.getList().stream().forEach(e->{ - if(e.get("receivePay") == null){ - e.put("receivePay",0); - } - if(e.get("payOut") == null){ - e.put("payOut",0); - } - if(e.get("balance") == null){ - e.put("balance",0); - } - }); Map result = new HashMap<>(); + record.setLimitStart(0); + record.setLimitEnd(Integer.MAX_VALUE); + List totalList = wxBillAllMapper.getReceiveAndPayBillAsPage(record); + if(CollectionUtils.isEmpty(totalList)){ + PageHelper.startPage(pageNum, pageSize); + PageInfo> pageInfo = new PageInfo(new ArrayList()); + pageInfo.setPages(0); + pageInfo.setTotal(0); + PageHelper.clearPage(); + result.put("pageInfo", pageInfo); + return result; + } + + int total = totalList.size(); + int pages; + if(total % pageSize == 0){ + pages = total / pageSize; + }else{ + pages = total / pageSize +1; + } + record.setLimitStart((pageNum -1) * pageSize); + record.setLimitEnd(pageSize); + List> list = wxBillAllMapper.getReceiveAndPayBillAsPage(record); + + PageHelper.startPage(pageNum, pageSize); + PageInfo> pageInfo = new PageInfo(list); + pageInfo.setPages(pages); + pageInfo.setTotal(total); + PageHelper.clearPage(); result.put("pageInfo", pageInfo); return result; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 81e011b0a..68a726a27 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -141,8 +141,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public ResultData saveOrUpdate(WxBillDaily record, MallUserInfo user) { - int receivepay = record.getReceivePay().intValue(); - int pay = record.getPay().intValue(); + int receivepay = record.getReceivePay()==null?0:record.getReceivePay().intValue(); + int pay = record.getPay()==null?0:record.getPay().intValue(); if(pay>receivepay){ return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(),"实收金额不能大于实际应收金额"); } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8b25ffe46..d4fa4cffa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -739,26 +739,28 @@