From 9ba7f281cf4f9669d3f0b629f5501ecd9a977043 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 27 May 2024 14:22:17 +0800 Subject: [PATCH] bug --- .../java/com/peanut/modules/common/to/ParamTo.java | 2 ++ .../master/controller/ShopStoreController.java | 14 ++++++-------- .../impl/ShopStoreToProductServiceImpl.java | 6 +++++- .../sociology/service/impl/CourseServiceImpl.java | 1 + src/main/resources/logback-spring.xml | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/to/ParamTo.java b/src/main/java/com/peanut/modules/common/to/ParamTo.java index 02af230a..613c8510 100644 --- a/src/main/java/com/peanut/modules/common/to/ParamTo.java +++ b/src/main/java/com/peanut/modules/common/to/ParamTo.java @@ -15,4 +15,6 @@ public class ParamTo { private String keywords; + private String type; + } diff --git a/src/main/java/com/peanut/modules/master/controller/ShopStoreController.java b/src/main/java/com/peanut/modules/master/controller/ShopStoreController.java index 83fa860d..e432eca1 100644 --- a/src/main/java/com/peanut/modules/master/controller/ShopStoreController.java +++ b/src/main/java/com/peanut/modules/master/controller/ShopStoreController.java @@ -1,5 +1,6 @@ package com.peanut.modules.master.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; @@ -33,13 +34,10 @@ public class ShopStoreController { */ @RequestMapping("/getStoreList") public R getStoreList(@RequestBody Map params){ - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - if (params.containsKey("name")&&!"".equals(params.get("name").toString())){ - wrapper.like(ShopStore::getName,params.get("name").toString()); - } - Page page = shopStoreService.page(new Page<>( - Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); - return R.ok().put("result", page); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.orderByAsc(ShopStore::getSort); + List shopStores = shopStoreService.getBaseMapper().selectList(wrapper); + return R.ok().put("list",shopStores); } @RequestMapping(path = "/getStoreById") @@ -51,7 +49,7 @@ public class ShopStoreController { @RequestMapping(path = "/saveOrUpdateStore") public R saveOrUpdateStore(@RequestBody ShopStore store) { shopStoreService.saveOrUpdate(store); - return R.ok(); + return R.ok().put("result",store); } @RequestMapping(path = "/delStore") diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java index 6825351e..d503481a 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopStoreToProductServiceImpl.java @@ -44,7 +44,8 @@ public class ShopStoreToProductServiceImpl extends ServiceImpl shopProductLambdaQueryWrapper = new LambdaQueryWrapper<>(); shopProductLambdaQueryWrapper.like(StringUtils.isNotBlank(param.getKeywords()),ShopProduct::getProductName,param.getKeywords()); - shopProductLambdaQueryWrapper.notIn(ShopProduct::getProductId,collect); + shopProductLambdaQueryWrapper.eq(param.getType().equals("00"),ShopProduct::getGoodsType,param.getType()); + shopProductLambdaQueryWrapper.notIn(collect.size()>0,ShopProduct::getProductId,collect); Page shopProductPage = shopProductDao.selectPage(new Page<>(param.getPage(), param.getLimit()), shopProductLambdaQueryWrapper); return shopProductPage; } @@ -69,6 +70,9 @@ public class ShopStoreToProductServiceImpl extends ServiceImpl map) { ShopStoreToProductEntity info = this.getById(map.get("id")); + if (info==null){ + return R.error("查找失败！"); + } info.setSort(map.get("sort")); this.updateById(info); return R.ok().put("result",info); diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index e6322998..13cdf3bf 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -176,6 +176,7 @@ public class CourseServiceImpl extends ServiceImpl impl UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity(); userCourseBuyEntity.setUserId(uId); userCourseBuyEntity.setCourseId(courseCatalogueEntity.getCourseId()); + userCourseBuyEntity.setCatalogueId(catalogueId); userCourseBuyEntity.setDays(30); userCourseBuyEntity.setCreateTime(new Date()); userCourseBuyEntity.setStartTime(new Date()); diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 1a298c87..f941ed08 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -210,8 +210,8 @@ - - + +