|
@@ -6,16 +6,17 @@ import com.yiqi.common.core.domain.AjaxResult;
|
|
|
import com.yiqi.common.core.page.TableDataInfo;
|
|
|
import com.yiqi.common.utils.DateUtils;
|
|
|
import com.yiqi.common.utils.poi.ExcelUtil;
|
|
|
+import com.yiqi.core.domain.SettlementStoreStatistics;
|
|
|
import com.yiqi.core.service.ISettlementFactoryStatisticsService;
|
|
|
import com.yiqi.core.service.ISettlementStoreClothStatisticsService;
|
|
|
+import com.yiqi.core.service.ISettlementStoreStatisticsService;
|
|
|
import com.yiqi.order.domain.dto.SettlementFactoryStatisticsDto;
|
|
|
+import com.yiqi.settlement.domain.dto.StoreChargeStatistics;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 平台统计报表
|
|
@@ -30,112 +31,95 @@ public class PlatformStatisticsController extends BaseController {
|
|
|
@Autowired
|
|
|
private ISettlementStoreClothStatisticsService settlementStoreClothStatisticsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISettlementStoreStatisticsService settlementStoreStatisticsService;
|
|
|
+
|
|
|
/**
|
|
|
* 获取工厂端首页总收益数据
|
|
|
*/
|
|
|
@GetMapping("/dashborad")
|
|
|
public AjaxResult dashboard() {
|
|
|
- SettlementFactoryStatisticsDto settlementFactoryStatisticsDto = settlementStoreClothStatisticsService.totalByCondition(getFactoryId(), null, null, null);
|
|
|
- return AjaxResult.success(settlementFactoryStatisticsDto);
|
|
|
+ // 获取订单统计数据
|
|
|
+ SettlementStoreStatistics orderStats = settlementStoreStatisticsService.orderTotal(null, null);
|
|
|
+
|
|
|
+ // 获取充值统计数据
|
|
|
+ StoreChargeStatistics chargeStats = settlementStoreStatisticsService.chargeTotal(null);
|
|
|
+
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+ result.put("orderStats", orderStats);
|
|
|
+ result.put("chargeStats", chargeStats);
|
|
|
+
|
|
|
+ return AjaxResult.success(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取门店每日交易统计列表
|
|
|
+ * 获取门店经营日报趋势数据
|
|
|
*/
|
|
|
- @GetMapping("/list/bydate")
|
|
|
- public TableDataInfo generateFactoryStatisticsByDate(@RequestParam(required = false) String startDate,
|
|
|
- @RequestParam(required = false) String endDate,
|
|
|
- @RequestParam(required = false) Long storeId,
|
|
|
- @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
- @RequestParam(defaultValue = "10") Integer pageSize) {
|
|
|
+ @GetMapping("/trend")
|
|
|
+ public AjaxResult getDailyTrend(@RequestParam("startDate") String startDate,
|
|
|
+ @RequestParam("endDate") String endDate) {
|
|
|
+ Date start = DateUtils.parseDate(startDate);
|
|
|
+ Date end = DateUtils.parseDate(endDate);
|
|
|
+ // 获取订单统计趋势
|
|
|
+ List<SettlementStoreStatistics> orderTrend = settlementStoreStatisticsService.generatePlatformStatisticsByDate(start, end);
|
|
|
|
|
|
- Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
|
|
|
- Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
|
|
|
- List<SettlementFactoryStatisticsDto> statisticsList = settlementFactoryStatisticsService
|
|
|
- .generateFactoryStatisticsByDate(getLoginUser().getOrgId(), storeId, start, end, pageNum, pageSize);
|
|
|
- Long totalCount = (long) statisticsList.size();
|
|
|
- // 4. 处理分页
|
|
|
- if (pageNum != null && pageSize != null && pageNum > 0 && pageSize > 0) {
|
|
|
- int startIndex = (pageNum - 1) * pageSize;
|
|
|
- int endIndex = Math.min(startIndex + pageSize, statisticsList.size());
|
|
|
- if (startIndex >= statisticsList.size()) {
|
|
|
- statisticsList = Collections.emptyList();
|
|
|
- }
|
|
|
- statisticsList = statisticsList.subList(startIndex, endIndex);
|
|
|
- }
|
|
|
- return getDataTable(statisticsList, totalCount);
|
|
|
- }
|
|
|
+ // 获取充值统计趋势
|
|
|
+ List<StoreChargeStatistics> chargeTrend = settlementStoreStatisticsService.generateChargeStatisticsByDate(0L, start, end);
|
|
|
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+ result.put("orderTrend", orderTrend);
|
|
|
+ result.put("chargeTrend", chargeTrend);
|
|
|
|
|
|
- /**
|
|
|
- * 获取门店每日充值统计列表
|
|
|
- */
|
|
|
- @GetMapping("/list/bystore")
|
|
|
- public TableDataInfo generateFactoryStatisticsByStore(@RequestParam(required = false) String startDate,
|
|
|
- @RequestParam(required = false) String endDate,
|
|
|
- @RequestParam(required = false) Long storeId,
|
|
|
- @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
- @RequestParam(defaultValue = "15") Integer pageSize) {
|
|
|
- Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
|
|
|
- Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
|
|
|
- List<SettlementFactoryStatisticsDto> statisticsList = settlementFactoryStatisticsService
|
|
|
- .generateFactoryStatisticsByStoreId(getLoginUser().getOrgId(), storeId, start, end);
|
|
|
- Long totalCount = (long) statisticsList.size();
|
|
|
- // 4. 处理分页
|
|
|
- if (pageNum != null && pageSize != null && pageNum > 0 && pageSize > 0) {
|
|
|
- int startIndex = (pageNum - 1) * pageSize;
|
|
|
- int endIndex = Math.min(startIndex + pageSize, statisticsList.size());
|
|
|
- if (startIndex >= statisticsList.size()) {
|
|
|
- statisticsList = Collections.emptyList();
|
|
|
- }
|
|
|
- statisticsList = statisticsList.subList(startIndex, endIndex);
|
|
|
- }
|
|
|
- return getDataTable(statisticsList, totalCount);
|
|
|
+ return AjaxResult.success(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取门店每日充值统计列表
|
|
|
+ * 获取门店每日交易统计列表
|
|
|
*/
|
|
|
- @GetMapping("/total")
|
|
|
- public AjaxResult generateFactoryStatistics(@RequestParam(required = false) String startDate,
|
|
|
- @RequestParam(required = false) String endDate,
|
|
|
- @RequestParam(required = false) Long storeId,
|
|
|
- @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
- @RequestParam(defaultValue = "15") Integer pageSize) {
|
|
|
- Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
|
|
|
- Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
|
|
|
- SettlementFactoryStatisticsDto settlementFactoryStatisticsDto = settlementFactoryStatisticsService
|
|
|
- .generateTotalFactoryStatistics(getLoginUser().getOrgId(), storeId, start, end);
|
|
|
- return AjaxResult.success(settlementFactoryStatisticsDto);
|
|
|
+ @GetMapping("/order/list")
|
|
|
+ public AjaxResult list(@RequestParam(required = false) String startDate,
|
|
|
+ @RequestParam(required = false) String endDate,
|
|
|
+ @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
+ @RequestParam(defaultValue = "15") Integer pageSize) {
|
|
|
+
|
|
|
+ Date start = DateUtils.parseDate(startDate);
|
|
|
+ Date end = DateUtils.parseDate(endDate);
|
|
|
+ // 获取订单统计趋势
|
|
|
+ List<SettlementStoreStatistics> orderTrend = settlementStoreStatisticsService.generatePlatformStatisticsByDate(start, end);
|
|
|
+ return AjaxResult.success(orderTrend);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ * 获取门店每日充值统计列表
|
|
|
*/
|
|
|
- @PostMapping("/export/bystore")
|
|
|
- public void chargeExport(HttpServletResponse response, @RequestParam(required = false) String startDate,
|
|
|
- @RequestParam(required = false) String endDate,
|
|
|
- @RequestParam(required = false) Long storeId) {
|
|
|
- Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
|
|
|
- Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
|
|
|
- List<SettlementFactoryStatisticsDto> list = settlementFactoryStatisticsService
|
|
|
- .generateFactoryStatisticsByStoreId(getLoginUser().getOrgId(), storeId, start, end);
|
|
|
- ExcelUtil<SettlementFactoryStatisticsDto> util = new ExcelUtil<>(SettlementFactoryStatisticsDto.class);
|
|
|
- util.exportExcel(response, list, "工厂门店报表统计");
|
|
|
+ @GetMapping("/charge/list")
|
|
|
+ public AjaxResult chargeList(@RequestParam(required = false) String startDate,
|
|
|
+ @RequestParam(required = false) String endDate,
|
|
|
+ @RequestParam(required = false) Integer sort,
|
|
|
+ @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
+ @RequestParam(defaultValue = "15") Integer pageSize) {
|
|
|
+ Date start = DateUtils.parseDate(startDate);
|
|
|
+ Date end = DateUtils.parseDate(endDate);
|
|
|
+
|
|
|
+ // 获取充值统计趋势
|
|
|
+ List<StoreChargeStatistics> chargeTrend = settlementStoreStatisticsService.generateChargeStatisticsByDate(0L, start, end);
|
|
|
+ return AjaxResult.success(chargeTrend);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 导出门店每日交易统计
|
|
|
+ * 获取门店每日订单统计列表
|
|
|
*/
|
|
|
- @PostMapping("/export/bydate")
|
|
|
- public void export(HttpServletResponse response, @RequestParam(required = false) String startDate,
|
|
|
- @RequestParam(required = false) String endDate,
|
|
|
- @RequestParam(required = false) Long storeId) {
|
|
|
+ @GetMapping("/order/bystore")
|
|
|
+ public TableDataInfo generateStatisticsByStore(@RequestParam(required = false) String startDate,
|
|
|
+ @RequestParam(required = false) String endDate,
|
|
|
+ @RequestParam(required = false) Long storeId,
|
|
|
+ @RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
+ @RequestParam(defaultValue = "15") Integer pageSize) {
|
|
|
Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
|
|
|
Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
|
|
|
- List<SettlementFactoryStatisticsDto> list = settlementFactoryStatisticsService
|
|
|
- .generateFactoryStatisticsByDate(getLoginUser().getOrgId(), storeId, start, end, 1, 1000);
|
|
|
- ExcelUtil<SettlementFactoryStatisticsDto> util = new ExcelUtil<>(SettlementFactoryStatisticsDto.class);
|
|
|
- util.exportExcel(response, list, "工厂每日报表统计");
|
|
|
+ startPage();
|
|
|
+ List<SettlementStoreStatistics> settlementStoreStatistics = settlementStoreStatisticsService.generatePlatformStatisticsByStore(start, end);
|
|
|
+ return getDataTable(settlementStoreStatistics);
|
|
|
}
|
|
|
+
|
|
|
}
|