From a26e1b13e6d3741e298321a292d36ba72d853861 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 18 Sep 2024 15:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8Bid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/common/entity/ShopProduct.java    |  4 ++++
 .../common/service/impl/BuyOrderServiceImpl.java     | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProduct.java b/src/main/java/com/peanut/modules/common/entity/ShopProduct.java
index 8fc2c94e..a3a34ff9 100644
--- a/src/main/java/com/peanut/modules/common/entity/ShopProduct.java
+++ b/src/main/java/com/peanut/modules/common/entity/ShopProduct.java
@@ -182,4 +182,8 @@ public class ShopProduct implements Serializable {
      */
     @TableField(exist = false)
     private String orderSn;
+
+    //课程id
+    @TableField(exist = false)
+    private List<ShopProductCourseEntity> courseIds;
 }
diff --git a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
index ff8f4b47..081bd10c 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
@@ -40,6 +40,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     private BookBuyConfigDao bookBuyConfigDao;
     @Autowired
     private VipBuyConfigDao vipBuyConfigDao;
+    @Autowired
+    private ShopProductCourseDao shopProductCourseDao;
 
     @Override
     public Map<String, Object> initPrepareOrder(PrepareOrderDto prepareOrderDto) {
@@ -151,7 +153,17 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             buyOrderProductWrapper.selectAll(ShopProduct.class);
             buyOrderProductWrapper.eq(BuyOrder::getOrderId,buyOrder.getOrderId());
             List<ShopProduct> productInfo = buyOrderProductDao.selectJoinList(ShopProduct.class,buyOrderProductWrapper);
+            //添加关联课程id
+            for (ShopProduct sp:productInfo){
+                if (sp.getGoodsType()!=null&&"05".equals(sp.getGoodsType())){
+                    List<ShopProductCourseEntity> list = shopProductCourseDao.selectList(new LambdaQueryWrapper<ShopProductCourseEntity>()
+                            .eq(ShopProductCourseEntity::getProductId,sp.getProductId()));
+                    sp.setCourseIds(list);
+                }
+            }
             res.put("productInfo",productInfo);
+
+
             //添加快递信息
             LambdaQueryWrapper<ExpressOrder> expressOrderWrapper = new LambdaQueryWrapper<>();
             expressOrderWrapper.like(ExpressOrder::getOrderSn,buyOrder.getOrderSn());