From 85de1150aa4376fb6fface8ad2807b36d8fe12dc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 23 九月 2025 18:00:24 +0800
Subject: [PATCH] 导出新增会员id
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 86 insertions(+), 21 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index fc44324..aab361d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -10,6 +10,7 @@
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
+import cn.lili.base.Result;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.enums.ResultCode;
@@ -56,6 +57,7 @@
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.service.CouponService;
import cn.lili.modules.promotion.service.PintuanService;
+import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;
import cn.lili.modules.store.service.StoreDetailService;
import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
@@ -86,6 +88,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Cell;
@@ -109,6 +112,9 @@
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -1286,6 +1292,65 @@
return order;
}
+ @Override
+ public Result getOrderCount(StatisticsQueryParam queryParam) {
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = LocalDateTime.now(); // 缁撴潫鏃堕棿榛樿鏄綋鍓嶆椂闂�
+ int days = 0;
+
+ switch (queryParam.getSearchType()) {
+ case "TODAY":
+ // 浠婂ぉ锛氫粠浠婂ぉ0鐐瑰埌鐜板湪
+ startTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ days = 1;
+ break;
+ case "YESTERDAY":
+ // 鏄ㄥぉ锛氫粠鏄ㄥぉ0鐐瑰埌鏄ㄥぉ23:59:59
+ LocalDate yesterday = LocalDate.now().minusDays(1);
+ startTime = LocalDateTime.of(yesterday, LocalTime.MIN);
+ endTime = LocalDateTime.of(yesterday, LocalTime.MAX);
+ days = 1;
+ break;
+ case "LAST_SEVEN":
+ // 杩囧幓涓冨ぉ锛氫粠7澶╁墠0鐐瑰埌鐜板湪
+ startTime = LocalDateTime.of(LocalDate.now().minusDays(6), LocalTime.MIN);
+ days = 7;
+ break;
+ case "LAST_THIRTY":
+ // 杩囧幓30澶╋細浠�30澶╁墠0鐐瑰埌鐜板湪
+ startTime = LocalDateTime.of(LocalDate.now().minusDays(29), LocalTime.MIN);
+ days = 30;
+ break;
+ default:
+ return Result.error("涓嶆敮鎸佺殑鏃堕棿鑼冨洿绫诲瀷");
+ }
+
+// 2. 鏌ヨ璇ユ椂闂磋寖鍥村唴鐨勬瘡鏃ヨ鍗曟暟閲忥紙鎸夋棩鏈熷垎缁勶級
+// LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
+// queryWrapper.between(Order::getCreateTime, startTime, endTime);
+// // 鎸夋棩鏈熷垎缁勶紙鎻愬彇鏃ユ湡閮ㄥ垎锛�
+//
+// // 鎵ц鏌ヨ锛岃繑鍥炴棩鏈熷拰鏁伴噺鐨勬槧灏勶紙day -> count锛�
+// List<Map<String, Object>> maps = baseMapper.selectMaps(queryWrapper);
+// Map<String, Long> dayCountMap = maps.stream()
+// .collect(Collectors.toMap(
+// map -> map.get("day").toString(), // 鏃ユ湡瀛楃涓诧紙濡�2023-09-19锛�
+// map -> Long.valueOf(map.get("count").toString()) // 璁㈠崟鏁伴噺
+// ));
+//
+// // 3. 鐢熸垚瀹屾暣鐨勬棩鏈熷垪琛紙纭繚鍗充娇鏌愬ぉ娌℃湁璁㈠崟涔熶細杩斿洖0锛�
+// List<Long> orderCounts = new ArrayList<>(days);
+// for (int i = 0; i < days; i++) {
+// // 璁＄畻褰撳墠寰幆瀵瑰簲鐨勬棩鏈燂紙浠巗tartTime寮�濮嬬殑绗琲澶╋級
+// LocalDate currentDate = startTime.toLocalDate().plusDays(i);
+// String dateStr = currentDate.toString(); // 杞负yyyy-MM-dd鏍煎紡
+// // 浠庢槧灏勪腑鑾峰彇鏁伴噺锛屾病鏈夊垯涓�0
+// orderCounts.add(dayCountMap.getOrDefault(dateStr, 0L));
+// }
+
+ return null;
+ }
+
/**
* 铏氭嫙鎴愬洟
*
@@ -1636,7 +1701,7 @@
// 鍒涘缓琛ㄥご
Row header = sheet.createRow(0);
String[] headers = {"涓昏鍗曠紪鍙�", "瀛愯鍗曠紪鍙�", "閫夎喘鍟嗗搧", "鍟嗗搧鏁伴噺", "鍟嗗搧ID", "鍟嗗搧鍗曚环", "璁㈠崟搴斾粯閲戦",
- "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
+ "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","浼氬憳ID","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
"鐪�", "甯�", "鍖�", "琛楅亾", "璇︾粏鍦板潃", "涔板鐣欒█", "璁㈠崟鎻愪氦鏃堕棿", "鏀粯瀹屾垚鏃堕棿", "鏉ユ簮",
"璁㈠崟鐘舵��", "璁㈠崟绫诲瀷", "鍞悗鐘舵��", "鍙栨秷鍘熷洜", "鍙戣揣鏃堕棿", "瀹屾垚鏃堕棿", "搴楅摵"};
@@ -1661,27 +1726,27 @@
row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0);
row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0);
row.createCell(12).setCellValue(dto.getPaymentMethod());
+ row.createCell(13).setCellValue(dto.getMemberId());
+ row.createCell(14).setCellValue(dto.getNickName());
- row.createCell(13).setCellValue(dto.getNickName());
-
- row.createCell(14).setCellValue(dto.getConsigneeName());
- row.createCell(15).setCellValue(dto.getConsigneeMobile());
- row.createCell(16).setCellValue(dto.getProvince());
- row.createCell(17).setCellValue(dto.getCity());
- row.createCell(18).setCellValue(dto.getDistrict());
- row.createCell(19).setCellValue(dto.getStreet());
- row.createCell(20).setCellValue(dto.getConsigneeDetail());
- row.createCell(21).setCellValue(dto.getRemark());
- row.createCell(22).setCellValue(dto.getCreateTime());
- row.createCell(23).setCellValue(dto.getPaymentTime());
- row.createCell(24).setCellValue(dto.getClientType());
- row.createCell(25).setCellValue(dto.getOrderStatus());
- row.createCell(26).setCellValue(dto.getOrderType());
- row.createCell(27).setCellValue(dto.getAfterSaleStatus());
- row.createCell(28).setCellValue(dto.getCancelReason());
- row.createCell(29).setCellValue(dto.getLogisticsTime());
- row.createCell(30).setCellValue(dto.getCompleteTime());
- row.createCell(31).setCellValue(dto.getStoreName());
+ row.createCell(15).setCellValue(dto.getConsigneeName());
+ row.createCell(16).setCellValue(dto.getConsigneeMobile());
+ row.createCell(17).setCellValue(dto.getProvince());
+ row.createCell(18).setCellValue(dto.getCity());
+ row.createCell(19).setCellValue(dto.getDistrict());
+ row.createCell(20).setCellValue(dto.getStreet());
+ row.createCell(21).setCellValue(dto.getConsigneeDetail());
+ row.createCell(22).setCellValue(dto.getRemark());
+ row.createCell(23).setCellValue(dto.getCreateTime());
+ row.createCell(24).setCellValue(dto.getPaymentTime());
+ row.createCell(25).setCellValue(dto.getClientType());
+ row.createCell(26).setCellValue(dto.getOrderStatus());
+ row.createCell(27).setCellValue(dto.getOrderType());
+ row.createCell(28).setCellValue(dto.getAfterSaleStatus());
+ row.createCell(29).setCellValue(dto.getCancelReason());
+ row.createCell(30).setCellValue(dto.getLogisticsTime());
+ row.createCell(31).setCellValue(dto.getCompleteTime());
+ row.createCell(32).setCellValue(dto.getStoreName());
}
//淇敼鍒楀
--
Gitblit v1.8.0