From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test

---
 zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 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
new file mode 100644
index 0000000..e3a384a
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java
@@ -0,0 +1,43 @@
+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;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 客户数据统计
+ *
+ * @author wzy
+ * @date 2020-12-18
+ **/
+@Controller
+@RequestMapping(value = "/admin/vipStatistics")
+public class VipStatisticsAction {
+
+    @Autowired
+    private AchieveNewService achieveNewService;
+
+    @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