From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 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 6f16768..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
@@ -134,6 +134,16 @@
return tjVipSumDao.selectRepayment(timeSpaceParam, shopId, null);
case "10":
return tjVipSumDao.selectPerCustomCnt(timeSpaceParam, shopId, null);
+ case "11":
+ return tjVipSumDao.selectCustomGoodsCnt(timeSpaceParam, shopId, null);
+ case "12":
+ return tjVipSumDao.selectPerCustomPrice(timeSpaceParam, shopId, null);
+ case "13":
+ return tjVipSumDao.selectCost(timeSpaceParam, shopId, null);
+ case "14":
+ return tjVipSumDao.selectGrossProfit(timeSpaceParam, shopId, null);
+ case "15":
+ return tjVipSumDao.selectGrossProfitRate(timeSpaceParam, shopId, null);
case "16" :
return tjVipSumDao.selectHisConsume(timeSpaceParam, shopId, null);
case "17" :
@@ -144,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);
}
@@ -162,15 +176,43 @@
case "3" :
return tjVipSumDao.selectCardUse(timeSpaceParam, null, companyId);
case "4" :
- return tjVipSumDao.selectHisConsume(timeSpaceParam, null, companyId);
- case "5" :
- return tjVipSumDao.selectFreeConsume(timeSpaceParam, null, companyId);
- case "6" :
- return tjVipSumDao.selectCashRefund(timeSpaceParam, null, companyId);
- case "7" :
- return tjVipSumDao.selectCardRefund(timeSpaceParam, null, companyId);
- case "8" :
return tjVipSumDao.selectArrears(timeSpaceParam, null, companyId);
+ case "5" :
+ return tjVipSumDao.selectCashRefund(timeSpaceParam, null, companyId);
+ case "6" :
+ return tjVipSumDao.selectCardRefund(timeSpaceParam, null, companyId);
+ case "7":
+ return tjVipSumDao.selectProductAchieve(timeSpaceParam, null, companyId);
+ case "8":
+ return tjVipSumDao.selectCardAchieve(timeSpaceParam, null, companyId);
+ case "9":
+ return tjVipSumDao.selectRepayment(timeSpaceParam, null, companyId);
+ case "10":
+ return tjVipSumDao.selectPerCustomCnt(timeSpaceParam, null, companyId);
+ case "11":
+ return tjVipSumDao.selectCustomGoodsCnt(timeSpaceParam, null, companyId);
+ case "12":
+ return tjVipSumDao.selectPerCustomPrice(timeSpaceParam, null, companyId);
+ case "13":
+ return tjVipSumDao.selectCost(timeSpaceParam, null, companyId);
+ case "14":
+ return tjVipSumDao.selectCost(timeSpaceParam, null, companyId);
+ case "15":
+ return tjVipSumDao.selectCost(timeSpaceParam, null, companyId);
+ case "16" :
+ return tjVipSumDao.selectHisConsume(timeSpaceParam, null, companyId);
+ case "17" :
+ return tjVipSumDao.selectFreeConsume(timeSpaceParam, null, companyId);
+ case "18" :
+ return tjVipSumDao.selectPeopleCnt(timeSpaceParam, null, companyId);
+ case "19" :
+ 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);
}
@@ -257,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