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/ApiRankingAction.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
index 5a4b4fe..f3d4d1f 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
@@ -59,18 +59,15 @@
@PostMapping(value = "/findShopAchieveRanking")
public AjaxResult findShopAchieveRanking(@RequestBody RankingDto rankingDto) {
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("");
+ AchieveNew achieveNew = new AchieveNew();
+ QueryUtil.setQueryLimitCom(achieveNew);
+ achieveNew.setT1(rankingDto.getType());
+ achieveNew.setDatatime(new Date());
+
if (RankingDto.SALE.equals(rankingDto.getDataType())) {
- AchieveNew achieveNew = new AchieveNew();
- QueryUtil.setQueryLimitCom(achieveNew);
- achieveNew.setType(rankingDto.getType());
- achieveNew.setDatatime(new Date());
- List<RankingVo> list = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
+ List<RankingVo> list = achieveNewDao.selectShopSaleAchieveRanking(achieveNew);
ajaxResult.setRows(list);
} else {
- AchieveNew achieveNew = new AchieveNew();
- QueryUtil.setQueryLimitCom(achieveNew);
- achieveNew.setDatatime(new Date());
- achieveNew.setT1(rankingDto.getType());
List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
ajaxResult.setRows(rankingVos);
}
--
Gitblit v1.9.1