From 54bbfc2450d9642efc55c95385880e026b9289a4 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Wed, 15 Apr 2026 18:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8B=BC=E5=9B=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/MallOrderServiceImpl.java | 36 ++++++++++++++++++- .../mybatis/MallRefundRecordServiceImpl.java | 32 ++++++++++++----- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java index 2a35831d..95aaab0c 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java @@ -1293,6 +1293,23 @@ public class MallOrderServiceImpl extends ServiceImpl goodsList = mallOrderGoodsMapper.selectByOrderId(order.getId()); + if (goodsList == null || goodsList.isEmpty()) return; + List returnList = goodsList.stream() + .map(goods -> { + // 在这里为每个 MallOrderGoods 对象创建并填充对应的 MallReturnOrderGoods 对象 + MallReturnOrderGoods returnGoods = new MallReturnOrderGoods(); + returnGoods.setOrderId(record.getId()); + returnGoods.setProductId(goods.getProductId()); + returnGoods.setProductName(goods.getProductName()); + returnGoods.setProductPicture(goods.getProductPicture()); + returnGoods.setSpecs(goods.getSpecs()); + returnGoods.setPrice(goods.getPrice()); + returnGoods.setQuantity(goods.getQuantity()); + mallReturnOrderGoodsMapper.insert(returnGoods); + return returnGoods; + }) + .collect(Collectors.toList()); }else if(refundTypeStatus == 2){ record.setLinkId(workerId); mallRefundRecordMapper.insert(record); @@ -1308,6 +1325,23 @@ public class MallOrderServiceImpl extends ServiceImpl goodsList = mallOrderGoodsMapper.selectByOrderId(order.getId()); + if (goodsList == null || goodsList.isEmpty()) return; + List returnList = goodsList.stream() + .map(goods -> { + // 在这里为每个 MallOrderGoods 对象创建并填充对应的 MallReturnOrderGoods 对象 + MallReturnOrderGoods returnGoods = new MallReturnOrderGoods(); + returnGoods.setOrderId(order.getId()); + returnGoods.setProductId(goods.getProductId()); + returnGoods.setProductName(goods.getProductName()); + returnGoods.setProductPicture(goods.getProductPicture()); + returnGoods.setSpecs(goods.getSpecs()); + returnGoods.setPrice(goods.getPrice()); + returnGoods.setQuantity(goods.getQuantity()); + mallReturnOrderGoodsMapper.insert(returnGoods); + return returnGoods; + }) + .collect(Collectors.toList()); } /** @@ -1417,7 +1451,7 @@ public class MallOrderServiceImpl extends ServiceImpl { // 在这里为每个 MallOrderGoods 对象创建并填充对应的 MallReturnOrderGoods 对象 MallReturnOrderGoods returnGoods = new MallReturnOrderGoods(); - returnGoods.setOrderId(record.getId()); + returnGoods.setOrderId(order.getId()); returnGoods.setProductId(goods.getProductId()); returnGoods.setProductName(goods.getProductName()); returnGoods.setProductPicture(goods.getProductPicture()); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallRefundRecordServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallRefundRecordServiceImpl.java index 8f80fc8f..c01bd8d6 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallRefundRecordServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallRefundRecordServiceImpl.java @@ -1,14 +1,8 @@ package cc.hiver.mall.serviceimpl.mybatis; import cc.hiver.core.common.utils.SnowFlakeUtil; -import cc.hiver.mall.dao.mapper.MallDeliveryOrderMapper; -import cc.hiver.mall.dao.mapper.MallOrderMapper; -import cc.hiver.mall.dao.mapper.MallRefundRecordMapper; -import cc.hiver.mall.dao.mapper.MallReturnOrderGoodsMapper; -import cc.hiver.mall.entity.MallDeliveryOrder; -import cc.hiver.mall.entity.MallOrder; -import cc.hiver.mall.entity.MallRefundRecord; -import cc.hiver.mall.entity.MallReturnOrderGoods; +import cc.hiver.mall.dao.mapper.*; +import cc.hiver.mall.entity.*; import cc.hiver.mall.pojo.query.MallRefundRecordPageQuery; import cc.hiver.mall.service.mybatis.MallOrderService; import cc.hiver.mall.service.mybatis.MallRefundRecordService; @@ -25,6 +19,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 退款记录 Service 实现 @@ -66,6 +61,9 @@ public class MallRefundRecordServiceImpl extends ServiceImpl goodsList = mallOrderGoodsMapper.selectByOrderId(mallRefundRecord.getOrderId()); + if (goodsList == null || goodsList.isEmpty()) return; + List returnList = goodsList.stream() + .map(goods -> { + // 在这里为每个 MallOrderGoods 对象创建并填充对应的 MallReturnOrderGoods 对象 + MallReturnOrderGoods returnGoods = new MallReturnOrderGoods(); + returnGoods.setOrderId(mallRefundRecord.getOrderId()); + returnGoods.setProductId(goods.getProductId()); + returnGoods.setProductName(goods.getProductName()); + returnGoods.setProductPicture(goods.getProductPicture()); + returnGoods.setSpecs(goods.getSpecs()); + returnGoods.setPrice(goods.getPrice()); + returnGoods.setQuantity(goods.getQuantity()); + mallReturnOrderGoodsMapper.insert(returnGoods); + return returnGoods; + }) + .collect(Collectors.toList()); } }