From 36ca968755d48a60a7292a1a90e38b00bdf75536 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 18 九月 2025 14:44:06 +0800
Subject: [PATCH] 订单列表导出支持年月日时分秒
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 cdc97da..b775eca 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
@@ -807,6 +807,11 @@
lock.lock();
//鑾峰彇璁㈠崟淇℃伅
order = this.getBySn(orderSn);
+ //璁㈠崟骞傜瓑闂
+ if (OrderStatusEnum.COMPLETED.name().equals(order.getOrderStatus())) {
+ throw new ServiceException("褰撳墠璁㈠崟宸插畬鎴愭棤娉曞啀娆℃牳楠�");
+ }
+
//妫�娴嬭櫄鎷熻鍗曚俊鎭�
checkVerificationOrder(order, verificationCode);
order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
@@ -825,7 +830,7 @@
log.error("褰撳墠璁㈠崟璁㈠崟鍙蜂负:{}涓嶅瓨鍦ㄤ腑鐨勪紭鎯犲嵎涓嶅瓨鍦�----------------------->{}",order.getId(),orderItem.getOrderSn());
}else {
Integer num = orderItem.getNum();
- //褰撹喘涔版暟閲忛儴浣嶇┖鐨勬椂鍊欒繘琛�
+ //褰撹喘涔版暟閲忎笉涓虹┖鐨勬椂鍊欒繘琛�
if (num != null) {
for (int i = 1; i <= num; i++) {
CouponVirtual couponVirtual = getCouponVirtual(orderItem);
@@ -854,7 +859,7 @@
private static CouponVirtual getCouponVirtual(OrderItem orderItem) {
CouponVirtual couponVirtual = new CouponVirtual();
- couponVirtual.setOrderId(orderItem.getSn());
+ couponVirtual.setOrderId(orderItem.getOrderSn());
couponVirtual.setCouponId(orderItem.getCouponId());
couponVirtual.setCouponName(orderItem.getCouponName());
couponVirtual.setGoodsId(orderItem.getGoodsId());
--
Gitblit v1.8.0