From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java
index 26641eb..e3a384a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java
@@ -1,7 +1,11 @@
package com.matrix.system.hive.statistics;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.service.AchieveNewService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +32,10 @@
@RequestMapping(value = "/vipConsumeStatistics")
@ResponseBody
public AjaxResult vipConsumeStatistics(AchieveNew achieveNew, PaginationVO pageVo) {
+ SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ achieveNew.setShopId(sysUsers.getShopId());
+ }
List<AchieveNew> list = achieveNewService.findVipConsumeStatisticsList(achieveNew, pageVo);
int total = achieveNewService.findVipConsumeStatisticsTotal(achieveNew);
return AjaxResult.buildSuccessInstance(list, total);
--
Gitblit v1.9.1