From 3cbd29de4b0cb0e1ff9dfd0c9199d61d809e132b Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 22 Apr 2024 16:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/book/controller/BuyOrderController.java | 2 +-
 .../modules/master/service/impl/CourseServiceImpl.java     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
index c6b6a95b..724988bb 100644
--- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
@@ -789,7 +789,7 @@ public class BuyOrderController {
      */
     private BigDecimal useCouponAmount(BuyOrder buyOrder) {
         Integer couponId = buyOrder.getCouponId();
-        if (couponId != null) {
+        if (couponId != null&&couponId!=0) {
             CouponHistoryEntity couponHistory = couponHistoryService.getById(couponId);
             couponHistory.setUseStatus(1);
             couponHistory.setUseTime(new Date());
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
index da115132..9e1a1050 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
@@ -129,10 +129,12 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             if(shopProductCourseDao.selectCount(new LambdaQueryWrapper<ShopProductCourseEntity>().eq(ShopProductCourseEntity::getCatalogueId,c.getId()))>0){
                 continue;
             }
+            CourseEntity one = this.getOne(new LambdaQueryWrapper<CourseEntity>().eq(CourseEntity::getId, c.getCourseId()));
             ShopProduct shopProduct = new ShopProduct();
-            shopProduct.setProductName(c.getTitle()+"."+c.getTitle()+"(半年)");
+            shopProduct.setProductName(one.getTitle()+"."+c.getTitle()+"(半年)");
             shopProduct.setPrice(c.getHalfFee());
             shopProduct.setGoodsType("05");
+            shopProduct.setProductStock(2000);
             shopProductDao.insert(shopProduct);
             //添加半年期的商品课程对应关系
             ShopProductCourseEntity shopProductCourseEntity = new ShopProductCourseEntity();
@@ -144,9 +146,10 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
 
             //添加一年期商品
             ShopProduct shopProduct1 = new ShopProduct();
-            shopProduct1.setProductName(c.getTitle()+"."+c.getTitle()+"(一年)");
+            shopProduct1.setProductName(one.getTitle()+"."+c.getTitle()+"(一年)");
             shopProduct1.setPrice(c.getFee());
             shopProduct1.setGoodsType("05");
+            shopProduct1.setProductStock(2000);
             shopProductDao.insert(shopProduct1);
             //添加一年期的商品课程对应关系
             ShopProductCourseEntity shopProductCourseEntity1 = new ShopProductCourseEntity();