对接拼团数据1

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java

@@ -1293,6 +1293,23 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
             if(refundTypeStatus == 1){
                 record.setLinkId(order.getShopId());
                 mallRefundRecordMapper.insert(record);
+                List<MallOrderGoods> goodsList = mallOrderGoodsMapper.selectByOrderId(order.getId());
+                if (goodsList == null || goodsList.isEmpty()) return;
+                List<MallReturnOrderGoods> 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<MallOrderMapper, MallOrder
                 mallRefundRecordMapper.insert(mallRefundRecord1);
             }
         }
+        List<MallOrderGoods> goodsList = mallOrderGoodsMapper.selectByOrderId(order.getId());
+        if (goodsList == null || goodsList.isEmpty()) return;
+        List<MallReturnOrderGoods> 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<MallOrderMapper, MallOrder
                 .map(goods -> {
                     // 在这里为每个 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());

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.*;
-import cc.hiver.mall.dao.mapper.MallOrderMapper;
+import cc.hiver.mall.entity.*;
-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.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<MallRefundRecordMap
     @Autowired
     private MallUserCouponService mallUserCouponService;
 
+    @Autowired
+    private MallOrderGoodsMapper mallOrderGoodsMapper;
+
     @Autowired
     private MallDeliveryOrderMapper mallDeliveryOrderMapper;
 
@@ -116,6 +114,24 @@ public class MallRefundRecordServiceImpl extends ServiceImpl<MallRefundRecordMap
             for(MallReturnOrderGoods item : mallRefundRecord.getItems()){
                 mallReturnOrderGoodsMapper.insert(item);
             }
+        }else{
+            List<MallOrderGoods> goodsList = mallOrderGoodsMapper.selectByOrderId(mallRefundRecord.getOrderId());
+            if (goodsList == null || goodsList.isEmpty()) return;
+            List<MallReturnOrderGoods> 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());
         }
     }