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("未找到一年期商品"); } }