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/hive/statistics/SysBusinessDataAction.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java
index 0b2fa69..14b05f9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java
@@ -60,22 +60,46 @@
@RequestMapping(value = "/findDailySaleData")
@ResponseBody
public AjaxResult findDailySaleData(DailySaleVo dailySaleVo, PaginationVO pageVo) {
-
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
Calendar calendar = Calendar.getInstance();
+ int total = 999;
+
+ Date endDate = new Date();
+ if (dailySaleVo.getEndTime() != null) {
+ if (!dailySaleVo.getEndTime().after(new Date())) {
+ calendar.setTime(dailySaleVo.getEndTime());
+ endDate = DateUtil.nextNDate(dailySaleVo.getEndTime(), 1);
+ }
+ }
+
+ calendar.add(Calendar.DATE, 1);
calendar.add(Calendar.DATE, -pageVo.getOffset());
String endTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
calendar.add(Calendar.DATE, -pageVo.getLimit());
String startTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+
+ if (dailySaleVo.getBeginTime() != null) {
+ Date startDate = DateUtil.stringToDate(startTime, DateUtil.DATE_FORMAT_DD);
+ if(dailySaleVo.getBeginTime().after(startDate)) {
+ startTime = DateUtil.dateFormatStr(dailySaleVo.getBeginTime(), DateUtil.DATE_FORMAT_DD);
+ }
+ long sub = DateUtil.getTimeSpan(dailySaleVo.getBeginTime(), endDate, null);
+ Long l = sub / (1000 * 3600 * 24);
+ total = l.intValue();
+ }
List<Date> xAxis = StatisticsTimeUtil.getTimeSpace(startTime, endTime, "日");
List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
List<StatisticsTimeDaoParam> statisticsTimeDaoParams = timeSpaceParam.subList(0, timeSpaceParam.size() - 2);
+ if (dailySaleVo.getShopId() == null) {
+ dailySaleVo.setShopId(user.getShopId());
+ }
List<DailySaleVo> dailySaleVos = sysBusinessDataDao.selectDailySaleData(statisticsTimeDaoParams, dailySaleVo.getShopId());
List<DailySaleVo> result = new ArrayList<>();
for (int i = dailySaleVos.size() - 1; i >= 0; i--) {
result.add(dailySaleVos.get(i));
}
- return AjaxResult.buildSuccessInstance(result);
+ return AjaxResult.buildSuccessInstance(result, total);
}
}
\ No newline at end of file
--
Gitblit v1.9.1