From bf1dd7dbb902a55e2b872b18310823d67b8ddca9 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 22 Apr 2025 13:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E8=AF=BB=E5=88=97=E8=A1=A8=E6=8C=8936?= =?UTF-8?q?5=E5=A4=A9=E4=BB=B7=E6=A0=BC=E6=8E=92=E5=BA=8F=E5=8F=96?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CourseRelearnController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java index a68c20b3..beb0f957 100644 --- a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java +++ b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java @@ -108,10 +108,10 @@ public class CourseRelearnController { wrapper.selectAll(ShopProduct.class); wrapper.eq(ShopProductCourseEntity::getCatalogueId,params.get("catalogueId")); wrapper.eq(ShopProductCourseEntity::getDays,365); - ShopProduct shopProduct = shopProductService.getOne(wrapper); - if (shopProduct == null) { - return R.error("未找到一年期商品"); - }else { + wrapper.orderByAsc(ShopProduct::getPrice); + List shopProducts = shopProductService.list(wrapper); + if (shopProducts.size()>0) { + ShopProduct shopProduct = shopProducts.get(0); ShopProduct sp1 = new ShopProduct(); sp1.setProductId(shopProduct.getProductId()); sp1.setProductName(shopProduct.getProductName().replace("一年","一月")); @@ -132,6 +132,8 @@ public class CourseRelearnController { res.add(sp1); res.add(sp2); return R.ok().put("productList",res); + }else { + return R.error("未找到一年期商品"); } }