From 795b442cdce7b5577f1dcd021f1d2d5cffdaca6c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 23 九月 2025 17:01:19 +0800
Subject: [PATCH] Merge branch 'send_coupon' into dev
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 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 d458917..3493838 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;
@@ -1246,12 +1252,31 @@
orderLogService.saveBatch(orderLogList);
//鍒ゆ柇璁㈠崟璐х墿鏄惁鍏ㄩ儴鍙戣揣瀹屾瘯
Boolean delivery = true;
+ log.info("鎵撳嵃璁㈠崟璐х墿:{}",orderItemList);
+
+ //闇�瑕佸啀姝ゅ鍒ゆ柇璁㈠崟鏄惁鏈夌敵璇峰敭鍚庣姸鎬�
for (OrderItem orderItem : orderItemList) {
- if (orderItem.getDeliverNumber() < orderItem.getNum()) {
- delivery = false;
- break;
+ // 鍏堝垽鏂槸鍚︽槸鏈敵璇峰敭鍚庣殑璁㈠崟
+ if (OrderItemAfterSaleStatusEnum.NOT_APPLIED.name().equals(orderItem.getAfterSaleStatus())){
+ // 鍙戣揣鏁伴噺灏忎簬璁㈠崟鏁伴噺鍒欏叏鍙�
+ log.info("鎵撳嵃鍙戣揣鏁伴噺锛歿},璇ュ晢鍝佽鍗曟暟閲忚揣鐗╁搴旂殑:{}",orderItem.getDeliverNumber(),orderItem.getNum());
+ if (orderItem.getDeliverNumber() < orderItem.getNum()) {
+ delivery = false;
+ break;
+ }
+ }else{
+ //鍏ㄩ儴閫�鍥炴儏鍐�
+ if(Objects.equals(orderItem.getReturnGoodsNumber(), orderItem.getNum())){
+ break;
+ }
+ //瀛樺湪鎯呭喌 閫�鍥炴暟閲忎笉鏄叏閮ㄩ��鍥炶�屾槸閮ㄥ垎閫�鍥�
+ if (orderItem.getReturnGoodsNumber() + orderItem.getDeliverNumber() < orderItem.getNum()) {
+ delivery = false;
+ break;
+ }
}
}
+ log.info("delivery鐘舵��:{}",delivery);
//鏄惁鍏ㄩ儴鍙戣揣
if (delivery) {
return delivery(orderSn, invoiceNumber, logisticsId);
@@ -1265,6 +1290,65 @@
order.setSellerRemark(sellerRemark);
this.updateById(order);
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;
}
/**
@@ -1283,6 +1367,7 @@
for (Order unpaidOrder : unpaidOrders) {
this.systemCancel(unpaidOrder.getSn(), "鎷煎洟娲诲姩缁撴潫璁㈠崟鏈粯娆撅紝绯荤粺鑷姩鍙栨秷璁㈠崟", false);
}
+
}
List<Order> paidOrders = listMap.get(PayStatusEnum.PAID.name());
//濡傚緟鍙傚洟浜烘暟澶т簬0锛屽苟宸插紑鍚櫄鎷熸垚鍥�
--
Gitblit v1.8.0