From dda6f4a70b67397190712a93c620666a2a3ca5e3 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 5 Jun 2024 15:25:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/service/impl/BuyOrderServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java index 27802770..baa235f1 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java @@ -82,7 +82,9 @@ public class BuyOrderServiceImpl extends ServiceImpl impl new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, b.getOrderId())); if (buyOrderProducts.size() > 0) { for (BuyOrderProduct bb : buyOrderProducts){ - bb.setProduct(shopProductDao.selectById(bb.getProductId())); + MPJLambdaWrapper w = new MPJLambdaWrapper<>(); + w.disableLogicDel().eq(ShopProduct::getProductId,bb.getProductId()); + bb.setProduct(shopProductDao.selectOne(w)); } b.setProductList(buyOrderProducts); b.setTimestamp(b.getCreateTime().getTime()/1000); @@ -122,7 +124,8 @@ public class BuyOrderServiceImpl extends ServiceImpl impl //添加商品信息 MPJLambdaWrapper buyOrderProductWrapper = new MPJLambdaWrapper<>(); buyOrderProductWrapper.leftJoin(BuyOrder.class,BuyOrder::getOrderId,BuyOrderProduct::getOrderId); - buyOrderProductWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); + //关掉本次查询del_flg = 0的条件，查询出已删除商品 + buyOrderProductWrapper.disableSubLogicDel().leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); buyOrderProductWrapper.selectAs(BuyOrderProduct::getQuantity,"quantity"); buyOrderProductWrapper.selectAll(ShopProduct.class); buyOrderProductWrapper.eq(BuyOrder::getOrderId,buyOrder.getOrderId()); From 72d6d1e888cede8127c7283d231044dc66968ec0 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 5 Jun 2024 16:40:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=85=E5=80=BC=E3=80=81=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuyConfigController.java | 97 ++++++++++--------- ...Service.java => BookBuyConfigService.java} | 5 +- .../master/service/VipBuyConfigService.java | 7 ++ .../impl/BookBuyConfigServiceImpl.java | 13 +++ .../service/impl/BuyConfigServiceImpl.java | 29 ------ .../service/impl/VipBuyConfigServiceImpl.java | 13 +++ 6 files changed, 84 insertions(+), 80 deletions(-) rename src/main/java/com/peanut/modules/master/service/{BuyConfigService.java => BookBuyConfigService.java} (64%) create mode 100644 src/main/java/com/peanut/modules/master/service/VipBuyConfigService.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/BookBuyConfigServiceImpl.java delete mode 100644 src/main/java/com/peanut/modules/master/service/impl/BuyConfigServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/VipBuyConfigServiceImpl.java diff --git a/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java b/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java index b2ab906e..88289fba 100644 --- a/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java +++ b/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java @@ -1,82 +1,85 @@ package com.peanut.modules.master.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.peanut.common.utils.PageUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.BookBuyConfigEntity; -import com.peanut.modules.master.service.BuyConfigService; +import com.peanut.modules.common.entity.VipBuyConfigEntity; +import com.peanut.modules.master.service.BookBuyConfigService; +import com.peanut.modules.master.service.VipBuyConfigService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.List; import java.util.Map; /** * 充值价格表单管理 */ @Slf4j -@RestController("masterBookBuyConfig") -@RequestMapping("master/bookBuyConfig") +@RestController("masterBuyConfig") +@RequestMapping("master/BuyConfig") public class BuyConfigController { @Autowired - private BuyConfigService buyConfigService; + private BookBuyConfigService bookBuyConfigService; + @Autowired + private VipBuyConfigService vipBuyConfigService; - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestParam Map params){ - PageUtils page = buyConfigService.queryPage(params); - return R.ok().put("page", page); + @RequestMapping("/getBookBuyConfigList") + public R getBookBuyConfigList(@RequestBody Map params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (StringUtils.isNotEmpty(params.get("qudao").toString())) { + wrapper.eq(BookBuyConfigEntity::getQudao,params.get("qudao")); + } + Page page = bookBuyConfigService.page(new Page<>( + Long.parseLong(params.get("page").toString()), Long.parseLong(params.get("limit").toString())), wrapper); + return R.ok().put("result", page); } - /** - * 信息 - */ - @RequestMapping("/info/{priceTypeId}") - public R info(@PathVariable("priceTypeId") Integer priceTypeId){ - BookBuyConfigEntity bookBuyConfig = buyConfigService.getById(priceTypeId); - return R.ok().put("bookBuyConfig", bookBuyConfig); + @RequestMapping("/getBookBuyConfigById") + public R getBookBuyConfigById(@RequestBody Map params) { + return R.ok().put("data",bookBuyConfigService.getById(params.get("id").toString())); } - /** - * 保存 - */ - @RequestMapping("/save") - public R save(@RequestBody BookBuyConfigEntity bookBuyConfig){ - buyConfigService.save(bookBuyConfig); + @RequestMapping("/saveOrUpdateBookBuyConfig") + public R addBookBuyConfig(@RequestBody BookBuyConfigEntity config){ + bookBuyConfigService.saveOrUpdate(config); return R.ok(); } - /** - * 修改 - */ - @RequestMapping("/update") - public R update(@RequestBody BookBuyConfigEntity bookBuyConfig){ - buyConfigService.updateById(bookBuyConfig); + @RequestMapping("/delBookBuyConfig") + public R delBookBuyConfig(@RequestBody Map params) { + bookBuyConfigService.removeById(params.get("id").toString()); return R.ok(); } - /** - * 删除 - */ - @RequestMapping("/delete") - public R delete(@RequestBody Integer[] priceTypeIds){ - buyConfigService.removeByIds(Arrays.asList(priceTypeIds)); + @RequestMapping("/getVipBuyConfigList") + public R getVipBuyConfigList(@RequestBody Map params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + Page page = vipBuyConfigService.page(new Page<>( + Long.parseLong(params.get("page").toString()), Long.parseLong(params.get("limit").toString())), wrapper); + return R.ok().put("result", page); + } + + @RequestMapping("/getVipBuyConfigById") + public R getVipBuyConfigById(@RequestBody Map params) { + return R.ok().put("data",vipBuyConfigService.getById(params.get("id").toString())); + } + + @RequestMapping("/saveOrUpdateVipBuyConfig") + public R addVipBuyConfig(@RequestBody VipBuyConfigEntity config){ + vipBuyConfigService.saveOrUpdate(config); return R.ok(); } - /** - * 获取VIP 金额 或者充值类型 - */ - @RequestMapping("/getVipOrPoint") - public R getVipOrPoint(@RequestParam("type") String type,@RequestParam("qudao") String qudao){ - List bookBuyConfigEntities = buyConfigService.getBaseMapper().selectList(new QueryWrapper().eq("type",type).eq("qudao",qudao)); - return R.ok().put("list",bookBuyConfigEntities); + @RequestMapping("/delVipBuyConfig") + public R delVipBuyConfig(@RequestBody Map params) { + vipBuyConfigService.removeById(params.get("id").toString()); + return R.ok(); } + } diff --git a/src/main/java/com/peanut/modules/master/service/BuyConfigService.java b/src/main/java/com/peanut/modules/master/service/BookBuyConfigService.java similarity index 64% rename from src/main/java/com/peanut/modules/master/service/BuyConfigService.java rename to src/main/java/com/peanut/modules/master/service/BookBuyConfigService.java index 2294a9c4..3be0dd9b 100644 --- a/src/main/java/com/peanut/modules/master/service/BuyConfigService.java +++ b/src/main/java/com/peanut/modules/master/service/BookBuyConfigService.java @@ -6,9 +6,6 @@ import com.peanut.modules.common.entity.BookBuyConfigEntity; import java.util.Map; -public interface BuyConfigService extends IService { - - PageUtils queryPage(Map params); - +public interface BookBuyConfigService extends IService { } diff --git a/src/main/java/com/peanut/modules/master/service/VipBuyConfigService.java b/src/main/java/com/peanut/modules/master/service/VipBuyConfigService.java new file mode 100644 index 00000000..fd249ec9 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/VipBuyConfigService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.VipBuyConfigEntity; + +public interface VipBuyConfigService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/BookBuyConfigServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/BookBuyConfigServiceImpl.java new file mode 100644 index 00000000..41d44dc0 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/BookBuyConfigServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.BookBuyConfigDao; +import com.peanut.modules.common.entity.BookBuyConfigEntity; +import com.peanut.modules.master.service.BookBuyConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterBookBuyConfigService") +public class BookBuyConfigServiceImpl extends ServiceImpl implements BookBuyConfigService { +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/master/service/impl/BuyConfigServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/BuyConfigServiceImpl.java deleted file mode 100644 index 6a1df9ed..00000000 --- a/src/main/java/com/peanut/modules/master/service/impl/BuyConfigServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.peanut.modules.master.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.common.utils.PageUtils; -import com.peanut.common.utils.Query; -import com.peanut.modules.common.dao.BookBuyConfigDao; -import com.peanut.modules.common.entity.BookBuyConfigEntity; -import com.peanut.modules.master.service.BuyConfigService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Slf4j -@Service("masterBuyConfigService") -public class BuyConfigServiceImpl extends ServiceImpl implements BuyConfigService { - - @Override - public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - return new PageUtils(page); - } - -} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/master/service/impl/VipBuyConfigServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/VipBuyConfigServiceImpl.java new file mode 100644 index 00000000..be7a7887 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/VipBuyConfigServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.VipBuyConfigDao; +import com.peanut.modules.common.entity.VipBuyConfigEntity; +import com.peanut.modules.master.service.VipBuyConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterVipBuyConfigService") +public class VipBuyConfigServiceImpl extends ServiceImpl implements VipBuyConfigService { +}