From e971ea090aa1f320f3c3f78c3a2a8d50f16dd4d0 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 15 Jan 2021 23:38:19 +0800
Subject: [PATCH] 小程序预约接口修改
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 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 c86edcb..97bbb20 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
@@ -3,6 +3,7 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.BusinessesDto;
import com.matrix.system.app.dto.VipStatisticsParamDto;
@@ -15,24 +16,19 @@
import com.matrix.system.hive.bean.SysBusinessData;
import com.matrix.system.hive.dao.SysBusinessDataDao;
import com.matrix.system.hive.service.imp.DataAnalysisCustomerServiceImpl;
-import com.matrix.system.hiveErp.analysUtil.Caculate;
-import com.matrix.system.hiveErp.analysUtil.SeriesVo;
-import com.matrix.system.hiveErp.analysUtil.StatisticsParamVo;
-import com.matrix.system.hiveErp.analysUtil.StatisticsTimeDaoParam;
+import com.matrix.system.hiveErp.analysUtil.*;
import com.matrix.system.hiveErp.dao.TjVipSumDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import org.jsoup.helper.DataUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -58,23 +54,55 @@
})
@PostMapping(value = "/findShopBusinessesData")
public AjaxResult findShopBusinessesData(@RequestBody BusinessesDto businessesDto) {
- SysBusinessData sysBusinessData = new SysBusinessData();
- // 若shopId为空，则查询门店经营报表
- if (businessesDto.getShopId() == null) {
- sysBusinessData.setShopId(businessesDto.getShopId());
- }
- QueryUtil.setQueryLimitCom(sysBusinessData);
-
+ String unit = "";
+ int calenderUnit;
if (BusinessesDto.DAY.equals(businessesDto.getType())) {
- sysBusinessData.setT1("%Y-%m-%d");
+ unit = "日";
+ calenderUnit = Calendar.DATE;
} else {
- sysBusinessData.setT1("%Y-%m");
+ unit = "月";
+ calenderUnit = Calendar.MONTH;
}
- PaginationVO pageVo = new PaginationVO();
- pageVo.setOffset((businessesDto.getPageNum() - 1) * businessesDto.getPageSize());
- pageVo.setLimit(businessesDto.getPageSize());
- return AjaxResult.buildSuccessInstance(sysBusinessDataDao.selectApiBusinessDataInPage(sysBusinessData, pageVo), sysBusinessDataDao.selectApiBusinessDataTotal(sysBusinessData));
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ int start = (businessesDto.getPageNum() - 1) * businessesDto.getPageSize();
+ int size = businessesDto.getPageSize();
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(calenderUnit, -start);
+ String endTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+ calendar.add(calenderUnit, -size);
+ String startTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+ List<Date> xAxis = StatisticsTimeUtil.getTimeSpace(startTime, endTime, unit);
+ List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
+ List<StatisticsTimeDaoParam> statisticsTimeDaoParams = timeSpaceParam.subList(0, timeSpaceParam.size() - 2);
+ List<BusinessesDataShowVo> list = sysBusinessDataDao.selectApiBusinessData(statisticsTimeDaoParams, businessesDto.getShopId(), user.getCompanyId());
+
+ List<BusinessesDataShowVo> result = new ArrayList<>();
+ for (int i = list.size() - 1; i >= 0; i--) {
+ BusinessesDataShowVo item = list.get(i);
+ String dataTime = item.getDataTime();
+ if (BusinessesDto.DAY.equals(businessesDto.getType())) {
+ item.setDataTime(DateUtil.dateToString(DateUtil.stringToDate(dataTime, DateUtil.DATE_FORMAT_DD), DateUtil.DATE_FORMAT_DD));
+ } else {
+ item.setDataTime(DateUtil.dateToString(DateUtil.stringToDate(dataTime, DateUtil.MONTH), DateUtil.MONTH));
+ }
+ result.add(item);
+ }
+ return AjaxResult.buildSuccessInstance(result);
+ }
+
+ public static void main(String[] args) {
+ int start = 1;
+
+ int end = 10;
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, start);
+ Date time = calendar.getTime();
+ System.out.println(time);
+ calendar.add(Calendar.DATE, end);
+ System.out.println(calendar.getTime());
+
}
@ApiOperation(value = "专项", notes = "专项")
@@ -184,7 +212,38 @@
@ApiOperation(value = "员工专项", notes = "员工专项")
@PostMapping(value = "/findVipBusinessData")
public AjaxResult findVipBusinessData(@RequestBody @Validated VipStatisticsParamDto vipStatisticsParamDto) {
- return null;
- }
+ AjaxResult ajaxResult = dataAnalysisCustomerService.getStaffAnalysisResult(vipStatisticsParamDto, new Caculate<BigDecimal>() {
+ @Override
+ public Map<String, BigDecimal> exec(List<StatisticsTimeDaoParam> timeSpaceParam, Long shopId, Long staffId) {
+ switch (vipStatisticsParamDto.getType()) {
+ case "1" :
+ return tjVipSumDao.selectStaffOrderAchieve(timeSpaceParam, staffId);
+ case "2" :
+ return tjVipSumDao.selectStaffCashAchieve(timeSpaceParam, staffId);
+ case "3" :
+ return tjVipSumDao.selectStaffCardAchieve(timeSpaceParam, staffId);
+ case "4" :
+ return tjVipSumDao.selectStaffGoodsAchieve(timeSpaceParam, staffId);
+ case "5" :
+ return tjVipSumDao.selectStaffCardUseAchieve(timeSpaceParam, staffId);
+ case "6" :
+ return tjVipSumDao.selectStaffHisConsumeAchieve(timeSpaceParam, staffId);
+ case "7" :
+ return tjVipSumDao.selectStaffFreeConsumeAchieve(timeSpaceParam, staffId);
+ case "8" :
+ return tjVipSumDao.selectStaffCommissionAchieve(timeSpaceParam, staffId);
+ case "9" :
+ return tjVipSumDao.selectStaffPeopleNum(timeSpaceParam, staffId);
+ case "10" :
+ return tjVipSumDao.selectStaffProjNum(timeSpaceParam, staffId);
+ case "11" :
+ return tjVipSumDao.selectStaffProjTime(timeSpaceParam, staffId);
+ default:
+ return tjVipSumDao.selectStaffOrderAchieve(timeSpaceParam, staffId);
+ }
+ }
+ });
+ return setDataList(ajaxResult);
+ }
}
--
Gitblit v1.9.1