diff --git a/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java b/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java index 91ede9d2..4db83171 100644 --- a/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java +++ b/src/main/java/com/peanut/modules/common/controller/TaihuWelfareController.java @@ -23,11 +23,9 @@ public class TaihuWelfareController { return taihuWelfareService.getTaihuWelfareArticleList(param); } - - public R getTaihuWelfareProductList(){ - - - return null; + @RequestMapping("/getTaihuWelfareProductList") + public R getTaihuWelfareProductList(@RequestBody ParamTo param){ + return taihuWelfareService.getTaihuWelfareProductList(param); } } diff --git a/src/main/java/com/peanut/modules/common/service/TaihuWelfareService.java b/src/main/java/com/peanut/modules/common/service/TaihuWelfareService.java index 709a0360..e630dc17 100644 --- a/src/main/java/com/peanut/modules/common/service/TaihuWelfareService.java +++ b/src/main/java/com/peanut/modules/common/service/TaihuWelfareService.java @@ -8,4 +8,6 @@ import com.peanut.modules.common.to.ParamTo; public interface TaihuWelfareService extends IService { R getTaihuWelfareArticleList(ParamTo param); + + R getTaihuWelfareProductList(ParamTo param); } diff --git a/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java index 1d2a5d98..79f455f9 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java @@ -3,15 +3,22 @@ package com.peanut.modules.common.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; +import com.peanut.modules.common.dao.ShopStoreToProductDao; import com.peanut.modules.common.dao.TaihuWelfareDao; +import com.peanut.modules.common.entity.ShopProduct; +import com.peanut.modules.common.entity.ShopStoreToProductEntity; import com.peanut.modules.common.entity.TaihuWelfareEntity; import com.peanut.modules.common.service.TaihuWelfareService; import com.peanut.modules.common.to.ParamTo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("commonTaihuWelfareService") public class TaihuWelfareServiceImpl extends ServiceImpl implements TaihuWelfareService { + @Autowired + private ShopStoreToProductDao shopStoreToProductDao; @Override public R getTaihuWelfareArticleList(ParamTo param) { @@ -20,4 +27,15 @@ public class TaihuWelfareServiceImpl extends ServiceImpl taihuWelfareEntityPage = this.getBaseMapper().selectPage(new Page<>(param.getPage(), param.getLimit()), wrapper); return R.ok().put("page",taihuWelfareEntityPage); } + + @Override + public R getTaihuWelfareProductList(ParamTo param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(ShopProduct.class); + wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopStoreToProductEntity::getProductId); + wrapper.eq(ShopStoreToProductEntity::getStoreId,1); + wrapper.orderByAsc(ShopStoreToProductEntity::getSort); + Page shopStoreToProductEntityPage = shopStoreToProductDao.selectPage(new Page<>(param.getPage(), param.getLimit()), wrapper); + return R.ok().put("page",shopStoreToProductEntityPage); + } }