From a8b79df7b7bbd5df0757ce4b3487f54d496abd85 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 29 Apr 2019 00:19:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98=E9=A2=84=E8=A7=88]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCUserDataController.java | 17 +++++++---------- .../com/iformall/domain/po/WxBillProperty.java | 9 --------- .../com/iformall/domain/po/WxBillRent.java | 9 --------- .../mapper/WxCUserBasicInfoMapper.java | 12 ++++++++---- .../service/WxCUserBasicInfoService.java | 16 ++++++++++++++++ .../impl/WxCUserBasicInfoServiceImpl.java | 11 +++++++++++ .../mapper/WxCUserBasicInfoMapper.xml | 18 +++++++++++++++++- 7 files changed, 59 insertions(+), 33 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java index b32303ca1..7b0c5723c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java @@ -130,24 +130,20 @@ public class WxCUserDataController extends BaseController { } map.put("weekVosCount", weekVosCount); //周新增会员 - //自然增长(全部排出导入的) + //自然增长 //String startdate = DateUtils.getTimeBefore(30, new Date()); //String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); - dto.setStartTime(null); - dto.setEndTime(null); - long growCount = wxCUserService.findCount(dto); - map.put("growCount", growCount); - //全部导入的 WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.setTenantId(getTenantId()); wxCUserBasicInfoDto.setStartTime(null); wxCUserBasicInfoDto.setEndTime(null); - long importCount = wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto); - map.put("importCount", importCount); - map.put("allHistoryUserCount", growCount+importCount); - + map.put("growCount", wxCUserBasicInfoService.findGrowUserCount(wxCUserBasicInfoDto)); + //全部导入的 + map.put("importCount", wxCUserBasicInfoService.findImportUserCount(wxCUserBasicInfoDto)); + //全部 + map.put("allHistoryUserCount", wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto)); return new ResultData(map); } @@ -352,3 +348,4 @@ public class WxCUserDataController extends BaseController { } + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index dfd40b37f..d342b6fa5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -131,15 +131,6 @@ public class WxBillProperty implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; - @io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate") - private Integer receivePayUpdate; - public Integer getReceivePayUpdate() { - return receivePayUpdate; - } - public void setReceivePayUpdate(Integer receivePayUpdate) { - this.receivePayUpdate = receivePayUpdate; - } - public String getComments() { return comments; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 1cc460e38..5a2ad5ed9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -134,15 +134,6 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; - @io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate") - private Integer receivePayUpdate; - public Integer getReceivePayUpdate() { - return receivePayUpdate; - } - public void setReceivePayUpdate(Integer receivePayUpdate) { - this.receivePayUpdate = receivePayUpdate; - } - public String getComments() { return comments; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index 071c084a2..ac19428cf 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -19,20 +19,24 @@ public interface WxCUserBasicInfoMapper extends CommonMapper findListByScore(WxCUserBasicInfoDto dto); - long findCount(WxCUserBasicInfoDto dto); + long findCount(WxCUserBasicInfoDto dto); List findVoList(WxCUserBasicInfo wxCUserBasicInfo); - Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); + Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); + long findGrowUserCount(WxCUserBasicInfoDto dto); + + long findImportUserCount(WxCUserBasicInfoDto dto); } + diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 5fc6c16d4..39d31a292 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -131,4 +131,20 @@ public interface WxCUserBasicInfoService { void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response); long findCountByFilter(WxCUserBasicInfoDto dto); + + + /** + * 自然增长用户 + * @param dto + * @return + */ + long findGrowUserCount(WxCUserBasicInfoDto dto); + + /** + * 导入用户数 + * @param dto + * @return + */ + long findImportUserCount(WxCUserBasicInfoDto dto); } + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 96ca36620..e839d0da9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -833,4 +833,15 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public long findCountByFilter(WxCUserBasicInfoDto dto) { return wxCUserBasicInfoMapper.findCount(dto); } + + @Override + public long findGrowUserCount(WxCUserBasicInfoDto dto) { + return wxCUserBasicInfoMapper.findGrowUserCount(dto); + } + + @Override + public long findImportUserCount(WxCUserBasicInfoDto dto) { + return wxCUserBasicInfoMapper.findImportUserCount(dto); + } } + diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 0a400ba40..1614ec56e 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -390,7 +390,7 @@ and JSON_CONTAINS(JSON_ARRAY(cut.tags),JSON_ARRAY - #{idItem} + #{idItem} ) @@ -411,4 +411,20 @@ + + + +