From 2562e13a8db342cc1e23e17b8a26d84ce314f9eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Aug 2021 12:04:57 +0800
Subject: [PATCH] 20210813

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
index 08a4bcb..3cdc992 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
@@ -154,6 +154,10 @@
                             return tjVipSumDao.selectProjConsumeCnt(timeSpaceParam, shopId, null);
                         case "20" :
                             return tjVipSumDao.selectTimeLength(timeSpaceParam, shopId, null);
+                        case "21" :
+                            return tjVipSumDao.selectCardAmount(timeSpaceParam, shopId, null);
+                        case "22" :
+                            return tjVipSumDao.selectFreeAmount(timeSpaceParam, shopId, null);
                         default :
                             return tjVipSumDao.selectBusinessInCome(timeSpaceParam, shopId, null);
                     }
@@ -205,6 +209,10 @@
                             return tjVipSumDao.selectProjConsumeCnt(timeSpaceParam, null, companyId);
                         case "20" :
                             return tjVipSumDao.selectTimeLength(timeSpaceParam, null, companyId);
+                        case "21" :
+                            return tjVipSumDao.selectCardAmount(timeSpaceParam, null, companyId);
+                        case "22" :
+                            return tjVipSumDao.selectFreeAmount(timeSpaceParam, null, companyId);
                         default :
                             return tjVipSumDao.selectBusinessInCome(timeSpaceParam, null, companyId);
                     }
@@ -291,18 +299,16 @@
                     case "4" :
                         return tjVipSumDao.selectStaffGoodsAchieve(timeSpaceParam, staffId);
                     case "5" :
-                        return tjVipSumDao.selectStaffCardUseAchieve(timeSpaceParam, staffId);
-                    case "6" :
                         return tjVipSumDao.selectStaffHisConsumeAchieve(timeSpaceParam, staffId);
-                    case "7" :
+                    case "6" :
                         return tjVipSumDao.selectStaffFreeConsumeAchieve(timeSpaceParam, staffId);
-                    case "8" :
+                    case "7" :
                         return tjVipSumDao.selectStaffCommissionAchieve(timeSpaceParam, staffId);
-                    case "9" :
+                    case "8" :
                         return tjVipSumDao.selectStaffPeopleNum(timeSpaceParam, staffId);
-                    case "10" :
+                    case "9" :
                         return tjVipSumDao.selectStaffProjNum(timeSpaceParam, staffId);
-                    case "11" :
+                    case "10" :
                         return tjVipSumDao.selectStaffProjTime(timeSpaceParam, staffId);
                     default:
                         return tjVipSumDao.selectStaffOrderAchieve(timeSpaceParam, staffId);

--
Gitblit v1.9.1