From be0d32868354df23cc2cf04b44764a2e9be897d2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 11 Feb 2022 18:43:20 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCUserDataController.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index fbd9d4ad4..b634b884f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -335,12 +335,13 @@ public class WxCUserDataController extends BaseController { @ApiOperation("查询用户消费金额") @GetMapping("findUserAmountData") @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") - public ResultData findUserAmountData(Integer plat) { + public ResultData findUserAmountData() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); - if(plat == null){ - plat = EnumAppPlat.WX.getCode(); - } TenantEntity tenantEntity = getTenantInfo(); + if(StringUtils.isBlank(tenantEntity.getTenantId())){ + //todo 集团版查询数据待重构 + return new ResultData("集团版查询数据待重构"); + } Calendar c = Calendar.getInstance(); Date today = c.getTime(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -422,6 +423,10 @@ public class WxCUserDataController extends BaseController { public ResultData findUserConsumeAmount() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserConsumeAmount"); TenantEntity tenantEntity = getTenantInfo(); + if(StringUtils.isBlank(tenantEntity.getTenantId())){ + //todo 集团版查询数据待重构 + return new ResultData("集团版查询数据待重构"); + } Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0);