From df115aec77ff63d19e74193478b46bcc6bbc4f09 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 12 九月 2025 17:05:24 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index a2ac7e5..8879063 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2344,16 +2344,19 @@
@Override
@Transactional
- public R returnOrder(GroupOrderConfirmParam param) {
+ public R returnOrder(ReturnOrderConfirmParam param) {
+ if (Cools.isEmpty(param.getOrderNumber())) {
+ param.setOrderNumber("THCK" + snowflakeIdWorker.nextId() + "");
+ }
// 1. 鏌ヨ鍗曟嵁鏄惁瀛樺湪
- Order order = orderMapper.selectOrderByOrderNo(param.getGroupOrderNumber());
+ Order order = orderMapper.selectOrderByOrderNo(param.getOrderNumber());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (order == null) {
// 1.1 涓嶅瓨鍦紝鏂板缓鍗曟嵁
order = new Order();
- order.setOrderNo(param.getGroupOrderNumber());
- order.setStatus(Integer.valueOf(param.getGroupStatus()));
+ order.setOrderNo(param.getOrderNumber());
+ order.setStatus(1);
order.setOrderTime(sdf.format(new Date()));
order.setCreateTime(new Date());
order.setSettle(1L);
@@ -2361,34 +2364,31 @@
orderMapper.insert(order);
} else {
// 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
- order.setStatus(Integer.valueOf(param.getGroupStatus()));
+ order.setStatus(1);
orderMapper.updateById(order);
}
orderDetlMapper.delete(
- new EntityWrapper<OrderDetl>().eq("order_no", param.getGroupOrderNumber())
+ new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNumber())
);
// 2. 涓�涓�瀵瑰簲閬嶅巻
- List<GroupOrderConfirmParam.PackageGroupNo> pkgList = param.getPackageGroupNos();
- List<GroupOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
+ List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
- int size = Math.min(pkgList.size(), volList.size()); // 闃叉瓒婄晫
- for (int i = 0; i < size; i++) {
- GroupOrderConfirmParam.PackageGroupNo pg = pkgList.get(i);
- GroupOrderConfirmParam.VolumeNumber vn = volList.get(i);
+ for (int i = 0; i < volList.size(); i++) {
+ ReturnOrderConfirmParam.VolumeNumber vn = volList.get(i);
// 鏌ヨ鏄惁宸插瓨鍦ㄨ detl
OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
- param.getGroupOrderNumber(), pg.getPackageGroupNo(), vn.getVolumeNumber()
+ param.getOrderNumber(), param.getPackageGroupNo(), vn.getVolumeNumber()
);
if (detl == null) {
detl = new OrderDetl();
detl.setOrderId(order.getId());
- detl.setOrderNo(param.getGroupOrderNumber());
+ detl.setOrderNo(param.getOrderNumber());
detl.setCreateTime(new Date());
detl.setAnfme(1.0);
- detl.setBrand(pg.getPackageGroupNo()); // 鍖呰缁勫彿
+ detl.setBrand(param.getPackageGroupNo()); // 鍖呰缁勫彿
detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
orderDetlMapper.insert(detl);
}
--
Gitblit v1.9.1