From 227b029030818925089cbe91dc1288594a5d4aa9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 21 Aug 2025 14:28:58 +0800
Subject: [PATCH] 退款订单
---
oying-common/src/main/java/com/oying/utils/DateUtil.java | 1 -
oying-system/src/main/java/com/oying/modules/sh/domain/request/ReturnOrder.java | 3 ++-
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
3 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/utils/DateUtil.java b/oying-common/src/main/java/com/oying/utils/DateUtil.java
index 5a1859a..b95aeed 100644
--- a/oying-common/src/main/java/com/oying/utils/DateUtil.java
+++ b/oying-common/src/main/java/com/oying/utils/DateUtil.java
@@ -17,7 +17,6 @@
public static final DateTimeFormatter DFY_MD = DateTimeFormatter.ofPattern("yyyy-MM-dd");
public static final DateTimeFormatter DFY_M = DateTimeFormatter.ofPattern("yyyy-MM");
public static final DateTimeFormatter SDF_YMDHMS = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
- public static final Integer DAY = 30;
public static boolean isBefore(String date, int count) {
LocalDateTime time = LocalDateTime.parse(date, SDF_YMDHMS);
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/request/ReturnOrder.java b/oying-system/src/main/java/com/oying/modules/sh/domain/request/ReturnOrder.java
index 3320573..66afd21 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/request/ReturnOrder.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/request/ReturnOrder.java
@@ -27,6 +27,7 @@
private String remark;
@ApiModelProperty(value = "图片地址，多张','分割")
private String photos;
- List<ProductOrder> productOrders;
+ @ApiModelProperty(value = "订单商品")
+ private List<ProductOrder> productOrders;
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
index d5add54..1d6d032 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
@@ -3,8 +3,11 @@
import com.oying.exception.BadRequestException;
import com.oying.modules.hwc.service.SwiftPassService;
import com.oying.modules.sh.domain.Order;
+import com.oying.modules.sh.domain.OrderProductSnapshot;
import com.oying.modules.sh.domain.OrderReturn;
+import com.oying.modules.sh.domain.OrderReturnProductSnapshot;
import com.oying.modules.sh.domain.request.AuditOrderReturn;
+import com.oying.modules.sh.domain.request.ProductOrder;
import com.oying.modules.sh.domain.request.ReturnOrder;
import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.modules.sh.domain.vo.OrderReturnResponse;
@@ -45,6 +48,7 @@
private final OrderAddressSnapshotService addressSnapshotService;
private static final String ORDER_RETURN_KEY = "oying:order:refund";
private static final String ORDER_CODE = "REFUND";
+ public static final Integer DAY = 30;
@Override
public PageResult<OrderReturn> queryAll(OrderReturnQueryCriteria criteria, Page<Object> page) {
@@ -90,7 +94,7 @@
if (returnOrder2 != null) {
throw new BadRequestException("退款订单已处理");
}
- if (!DateUtil.isBefore(order.getPayTime(), DateUtil.DAY)) {
+ if (!DateUtil.isBefore(order.getPayTime(), DAY)) {
throw new BadRequestException("订单已超过售后有效期");
}
// 退款订单
@@ -123,6 +127,36 @@
returnOrder.setPhotos(resources.getPhotos());
returnOrder.setAuditStatus(ReturnAuditEnum.ZERO.getKey());
orderReturnMapper.insert(returnOrder);
+ List<OrderReturnProductSnapshot> productSnapshots = new ArrayList<>();
+ for (ProductOrder productOrder : resources.getProductOrders()) {
+ for (OrderProductSnapshot snapshot : order.getProductSnapshots()) {
+ if (productOrder.getProductId().equals(snapshot.getProductId())) {
+ OrderReturnProductSnapshot productSnapshot = getSnapshot(snapshot, returnNum);
+ productSnapshots.add(productSnapshot);
+ }
+ }
+ }
+ productSnapshotService.saveBatch(productSnapshots);
+ }
+
+ private static OrderReturnProductSnapshot getSnapshot(OrderProductSnapshot snapshot, String returnNum) {
+ OrderReturnProductSnapshot productSnapshot = new OrderReturnProductSnapshot();
+ productSnapshot.setReturnNum(returnNum);
+ productSnapshot.setStoreId(snapshot.getStoreId());
+ productSnapshot.setProductId(snapshot.getProductId());
+ productSnapshot.setProductCode(snapshot.getProductCode() != null ? snapshot.getProductCode() : null);
+ productSnapshot.setProductBarcode(snapshot.getProductBarcode());
+ productSnapshot.setProductName(snapshot.getProductName());
+ productSnapshot.setProductTitle(snapshot.getProductTitle());
+ productSnapshot.setProductMainImage(snapshot.getProductMainImage());
+ productSnapshot.setProductDescription(snapshot.getProductDescription());
+ productSnapshot.setParamData(snapshot.getParamData() != null ? snapshot.getParamData() : null);
+ productSnapshot.setUnitPrice(snapshot.getUnitPrice());
+ productSnapshot.setDetailCount(snapshot.getDetailCount());
+ productSnapshot.setOriginalPrice(snapshot.getOriginalPrice());
+ productSnapshot.setPaidPrice(snapshot.getPaidPrice());
+ productSnapshot.setActuallyPayPrice(snapshot.getActuallyPayPrice());
+ return productSnapshot;
}
@Override
--
Gitblit v1.9.3