From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
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