| @@ -335,12 +335,13 @@ public class WxCUserDataController extends BaseController { | |||||
| @ApiOperation("查询用户消费金额") | @ApiOperation("查询用户消费金额") | ||||
| @GetMapping("findUserAmountData") | @GetMapping("findUserAmountData") | ||||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") | @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") | ||||
| public ResultData findUserAmountData(Integer plat) { | |||||
| public ResultData findUserAmountData() { | |||||
| logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); | logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); | ||||
| if(plat == null){ | |||||
| plat = EnumAppPlat.WX.getCode(); | |||||
| } | |||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| if(StringUtils.isBlank(tenantEntity.getTenantId())){ | |||||
| //todo 集团版查询数据待重构 | |||||
| return new ResultData("集团版查询数据待重构"); | |||||
| } | |||||
| Calendar c = Calendar.getInstance(); | Calendar c = Calendar.getInstance(); | ||||
| Date today = c.getTime(); | Date today = c.getTime(); | ||||
| c.add(Calendar.DAY_OF_YEAR, 1); | c.add(Calendar.DAY_OF_YEAR, 1); | ||||
| @@ -422,6 +423,10 @@ public class WxCUserDataController extends BaseController { | |||||
| public ResultData findUserConsumeAmount() { | public ResultData findUserConsumeAmount() { | ||||
| logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserConsumeAmount"); | logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserConsumeAmount"); | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| if(StringUtils.isBlank(tenantEntity.getTenantId())){ | |||||
| //todo 集团版查询数据待重构 | |||||
| return new ResultData("集团版查询数据待重构"); | |||||
| } | |||||
| Calendar c = Calendar.getInstance(); | Calendar c = Calendar.getInstance(); | ||||
| c.set(Calendar.HOUR_OF_DAY, 0); | c.set(Calendar.HOUR_OF_DAY, 0); | ||||
| c.set(Calendar.MINUTE, 0); | c.set(Calendar.MINUTE, 0); | ||||