From 808d722e852aa4beff9adddab129100d02385126 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sun, 7 Jan 2024 10:58:52 +0800 Subject: [PATCH] 1/7 --- .../api/appletgiftbag/AppletGiftBagVo.java | 2 +- .../biz/appletgiftbag/AppletGiftBagMapper.xml | 2 +- .../biz/appletgiftbag/AppletGiftBagRest.java | 8 +- .../appletgiftbag/AppletGiftBagService.java | 115 +++--------------- .../AppletGiftBagGoodsMapper.java | 6 +- .../AppletGiftBagGoodsService.java | 5 +- .../yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java | 2 + .../yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml | 15 +++ .../yxt/yyth/biz/lpkgoods/LpkGoodsRest.java | 8 +- .../yyth/biz/lpkgoods/LpkGoodsService.java | 115 +----------------- 10 files changed, 55 insertions(+), 223 deletions(-) diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java index b900231..b4e12fe 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java @@ -22,7 +22,7 @@ public class AppletGiftBagVo implements Vo { private String isEnable; private String isGrounding; private String isRecommend; - private String remark; + private String remarks; private String count;// } diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml index 16f5a6e..54f1ab4 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml @@ -31,7 +31,7 @@ \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java index 68e9119..2cb8d54 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java @@ -11,6 +11,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2023/11/21 15:03 @@ -59,9 +61,9 @@ public class AppletGiftBagRest { return AppletGiftBagService.isGrounding(sid, state); } @ApiOperation("小程序礼包信息列表") - @PostMapping("/appletGiftBagListPage") - public ResultBean> appletGiftBagListPage(@RequestBody PagerQuery pq) { - return AppletGiftBagService.appletGiftBagListPage(pq); + @GetMapping("/appletGiftBagListPage") + public ResultBean> appletGiftBagListPage() { + return AppletGiftBagService.appletGiftBagListPage(); } @ApiOperation("礼包初始化") @GetMapping("/getGiftBagBySid/{sid}") diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java index 1bc01e9..65f7578 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -193,113 +193,28 @@ public class AppletGiftBagService extends MybatisBaseService bags) { return baseMapper.saveBags(bags); } - public ResultBean> appletGiftBagListPage(PagerQuery pq) { + public ResultBean> appletGiftBagListPage() { ResultBean rb = ResultBean.fireFail(); - AppletGiftBagQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("1", "1"); - if (StringUtils.isNotBlank(query.getName())) { - qw.like("name", query.getName()); - } - qw.orderByDesc("isRecommend"); - qw.orderByDesc("createTime"); - IPage page = PagerUtil.queryToPage(pq); -// IPage pagging = baseMapper.giftBagListPage(page, qw); - IPage pagging = new Page<>(); - AppletGiftBagVo appletGiftBagVo=new AppletGiftBagVo(); - appletGiftBagVo.setName("父母陪伴窖卡"); - appletGiftBagVo.setPrice("1000"); - appletGiftBagVo.setIsRecommend("1"); - appletGiftBagVo.setIconUrl("https://lpk.yyundong.com/upload/20240106/20240106180750003098.jpg"); - appletGiftBagVo.setRemark("送父母，不能常伴左右，就在冬日为父母送上一份暖暖孝心。"); - appletGiftBagVo.setCount("7种蔬菜"); - AppletGiftBagVo appletGiftBagVo1=new AppletGiftBagVo(); - appletGiftBagVo1.setName("亲朋关怀窖卡"); - appletGiftBagVo1.setPrice("288"); - appletGiftBagVo1.setIsRecommend("2"); - appletGiftBagVo1.setIconUrl("https://lpk.yyundong.com/upload/20240106/20240106180340147089.jpg"); - appletGiftBagVo1.setRemark("送亲朋，直接转发二维码，方便快捷奉上每日的贴心关怀。"); - appletGiftBagVo1.setCount("6种蔬菜"); - AppletGiftBagVo appletGiftBagVo2=new AppletGiftBagVo(); - appletGiftBagVo2.setName("关爱家人窖卡"); - appletGiftBagVo2.setPrice("1000"); - appletGiftBagVo2.setIsRecommend("2"); - appletGiftBagVo2.setIconUrl("https://lpk.yyundong.com/upload/20240106/20240106180618741453.png"); - appletGiftBagVo2.setRemark("送亲朋，直接转发二维码，方便快捷奉上每日的贴心关怀。"); - appletGiftBagVo2.setCount("6种蔬菜"); - List appletGiftBagVos=new ArrayList<>(); - appletGiftBagVos.add(appletGiftBagVo); - appletGiftBagVos.add(appletGiftBagVo1); - appletGiftBagVos.add(appletGiftBagVo2); - pagging.setRecords(appletGiftBagVos); + List list=baseMapper.giftBagList(); + list.forEach(s->{ + List appletGiftBagGoods=appletGiftBagGoodsService.list(new QueryWrapper().eq("giftbagSid",s.getSid())); + s.setCount(appletGiftBagGoods.size()+"种蔬菜"); + }); - PagerVo p = PagerUtil.pageToVo(pagging, null); -// records.removeAll(Collections.singleton(null)); - return rb.success().setData(p); + return rb.success().setData(list); } public ResultBean getGiftBagBySid(String sid ) { ResultBean rb = ResultBean.fireFail(); - + List goodsList=appletGiftBagGoodsService.getGoodsByBagSidA(sid); AppletGiftBagDetailVo appletGiftBagVo=new AppletGiftBagDetailVo(); - appletGiftBagVo.setPrice("1000"); - GiftBagGoods goods=new GiftBagGoods(); - goods.setRemark("富含蛋白顾、钙、铁、硒等有益元素。"); - goods.setName("西瓜红密薯"); - goods.setUnitName("份"); - goods.setGoodsNumber("3"); - goods.setIconUrl("https://lpk.yyundong.com/upload/20231123/64dfc05b0db1f9_20231124100240220734.jpg"); - goods.setPrice("1.5"); - goods.setSpecificationUnit("斤"); - goods.setWeight("7"); - goods.setTotalValue("10.5"); - GiftBagGoods goods1=new GiftBagGoods(); - goods1.setRemark("北方大白菜打过霜后，口感发甜，更加可口"); - goods1.setName("北方大白菜"); - goods1.setUnitName("份"); - goods1.setGoodsNumber("3"); - goods1.setIconUrl("https://lpk.yyundong.com/upload/20231123/2960ea0741fe500_20231124100318707963.jpg"); - goods1.setPrice("0.5"); - goods1.setSpecificationUnit("斤"); - goods1.setWeight("15"); - goods1 .setTotalValue("7.5"); - GiftBagGoods goods2=new GiftBagGoods(); - goods2.setRemark("淀粉含量较高，口感更粉、更紧实"); - goods2.setName("张北土豆"); - goods2.setUnitName("份"); - goods2.setGoodsNumber("3"); - goods2.setIconUrl("https://lpk.yyundong.com/upload/20231123/64e0ca26fd65ab_20231124100217727035.jpg"); - goods2.setPrice("1"); - goods2.setSpecificationUnit("斤"); - goods2.setWeight("5"); - goods2.setTotalValue("5"); - GiftBagGoods goods3=new GiftBagGoods(); - goods3.setRemark("原料纯正，只有红薯粉，没有其他添加剂"); - goods3.setName("纯红薯粉条"); - goods3.setUnitName("份"); - goods3.setGoodsNumber("3"); - goods3.setIconUrl("https://lpk.yyundong.com/upload/20231123/64df3f35d0de3f_20231124100252533644.png"); - goods3.setPrice("10"); - goods3.setSpecificationUnit("斤"); - goods3.setWeight("2"); - goods3.setTotalValue("20"); - GiftBagGoods goods4=new GiftBagGoods(); - goods4.setRemark("味甜爽口，被誉为水中之宝。"); - goods4.setName("泥坑藕"); - goods4.setUnitName("份"); - goods4.setGoodsNumber("3"); - goods4.setIconUrl("https://lpk.yyundong.com/upload/20231130/泥坑藕_20231130151949723069.jpg"); - goods4.setPrice("5"); - goods4.setSpecificationUnit("斤"); - goods4.setWeight("5"); - goods4.setTotalValue("25"); - List goodsList=new ArrayList<>(); - goodsList.add(goods); - goodsList.add(goods1); - goodsList.add(goods2); - goodsList.add(goods3); - goodsList.add(goods4); + AppletGiftBag s= baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); + double i=0; + for(GiftBagGoods goods:goodsList){ + i=i+Double.valueOf(goods.getPrice())*Double.valueOf(goods.getGoodsNumber()); + } + appletGiftBagVo.setPrice(String.valueOf(i)); appletGiftBagVo.setGoods(goodsList); -// records.removeAll(Collections.singleton(null)); + appletGiftBagVo.setName(s.getName()); return rb.success().setData(appletGiftBagVo); } diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java index 7a04a63..9b48b11 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java @@ -1,6 +1,7 @@ package com.yxt.yyth.biz.appletgiftbaggoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yyth.api.appletgiftbag.GiftBagGoods; import com.yxt.yyth.api.appletgiftbaggoods.AppletGiftBagGoods; import com.yxt.yyth.api.appletgiftbaggoods.AppletGiftBagGoodsVo; import org.apache.ibatis.annotations.Mapper; @@ -20,9 +21,12 @@ public interface AppletGiftBagGoodsMapper extends BaseMapper int deleteGoodsByBagSid(@Param("sid") String sid); @Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl,goods.price,goods.unitName,goods.remarks " + - " from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") + " from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSid(String sid); + @Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price,goods.unitName,goods.content as remark " + + " ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") + List getGoodsByBagSidA(String sid); List getRecordsByBagSid(@Param("sid") String sid); int saveBagGoods(@Param("bagGoods") List bagGoods); diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java index 728acce..f92ab91 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsService.java @@ -1,6 +1,7 @@ package com.yxt.yyth.biz.appletgiftbaggoods; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.yyth.api.appletgiftbag.GiftBagGoods; import com.yxt.yyth.api.appletgiftbaggoods.AppletGiftBagGoods; import com.yxt.yyth.api.appletgiftbaggoods.AppletGiftBagGoodsVo; import org.springframework.stereotype.Service; @@ -25,7 +26,9 @@ public class AppletGiftBagGoodsService extends MybatisBaseService getGoodsByBagSid(String sid) { return baseMapper.getGoodsByBagSid(sid); } - + public List getGoodsByBagSidA(String sid) { + return baseMapper.getGoodsByBagSidA(sid); + } public int saveBagGoods(List bagGoods) { return baseMapper.saveBagGoods(bagGoods); diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java index 4a25ff3..4165676 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.yyth.api.appletgiftbag.GiftBagGoods; import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag; import com.yxt.yyth.api.lpkgoods.LpkGoods; import com.yxt.yyth.api.lpkgoods.LpkGoodsVo; @@ -26,4 +27,5 @@ public interface LpkGoodsMapper extends BaseMapper { LpkGoodsVo getGoodsDetails(@Param("sid")String sid); LpkGoods getGoodsByName(@Param("goodName") String goodName); + List getAllGoodsApplet(); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml index d16667a..5f462cc 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml @@ -61,5 +61,20 @@ from lpk_goods where `name` = #{goodName} + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java index b7c3258..5b4ac4d 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java @@ -68,10 +68,10 @@ public class LpkGoodsRest { public ResultBean appletGrounding(@PathVariable("sid") String sid,@PathVariable("state") String state) { return lpkGoodsService.appletGrounding(sid,state); } - @ApiOperation("自选礼包") - @PostMapping("/getAllGiftBagPage") - public ResultBean getAllGiftBagPage(@RequestBody PagerQuery pq) { - return lpkGoodsService.getAllGiftBagPage(pq); + @ApiOperation("商品信息") + @GetMapping("/getAllGiftBagPage") + public ResultBean getAllGiftBagPage() { + return lpkGoodsService.getAllGoodsApplet(); } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java index a68a10c..a706751 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java @@ -150,118 +150,9 @@ public class LpkGoodsService extends MybatisBaseService> getAllGiftBagPage(PagerQuery pq) { + public ResultBean> getAllGoodsApplet() { ResultBean rb = ResultBean.fireFail(); - AppletGiftBagQuery query = pq.getParams(); -// AppletGiftBagDetailVo appletGiftBagVo=new AppletGiftBagDetailVo(); -// appletGiftBagVo.setPrice("1000"); - IPage page = PagerUtil.queryToPage(pq); -// IPage pagging = baseMapper.giftBagListPage(page, qw); - IPage pagging = new Page<>(); - GiftBagGoods goods=new GiftBagGoods(); - goods.setRemark("富含蛋白顾、钙、铁、硒等有益元素。"); - goods.setName("西瓜红密薯"); - goods.setUnitName("份"); -// goods.setGoodsNumber("3"); - goods.setIconUrl("https://lpk.yyundong.com/upload/20231123/64dfc05b0db1f9_20231124100240220734.jpg"); - goods.setPrice("1.5"); - goods.setSpecificationUnit("斤"); - goods.setWeight("7"); - goods.setTotalValue("10.5"); - GiftBagGoods goods1=new GiftBagGoods(); - goods1.setRemark("北方大白菜打过霜后，口感发甜，更加可口"); - goods1.setName("北方大白菜"); - goods1.setUnitName("份"); -// goods1.setGoodsNumber("3"); - goods1.setIconUrl("https://lpk.yyundong.com/upload/20231123/2960ea0741fe500_20231124100318707963.jpg"); - goods1.setPrice("0.5"); - goods1.setSpecificationUnit("斤"); - goods1.setWeight("15"); - goods1 .setTotalValue("7.5"); - GiftBagGoods goods2=new GiftBagGoods(); - goods2.setRemark("淀粉含量较高，口感更粉、更紧实"); - goods.setName("张北土豆"); - goods2.setUnitName("份"); -// goods2.setGoodsNumber("3"); - goods2.setIconUrl("https://lpk.yyundong.com/upload/20231123/64e0ca26fd65ab_20231124100217727035.jpg"); - goods2.setPrice("1"); - goods2.setSpecificationUnit("斤"); - goods2.setWeight("5"); - goods2.setTotalValue("5"); - GiftBagGoods goods3=new GiftBagGoods(); - goods3.setRemark("原料纯正，只有红薯粉，没有其他添加剂"); - goods3.setName("纯红薯粉条"); - goods3.setUnitName("份"); -// goods3.setGoodsNumber("3"); - goods3.setIconUrl("https://lpk.yyundong.com/upload/20231123/64df3f35d0de3f_20231124100252533644.png"); - goods3.setPrice("10"); - goods3.setSpecificationUnit("斤"); - goods3.setWeight("2"); - goods3.setTotalValue("20"); - GiftBagGoods goods4=new GiftBagGoods(); - goods4.setRemark("味甜爽口，被誉为水中之宝。"); - goods4.setName("泥坑藕"); - goods4.setUnitName("份"); -// goods4.setGoodsNumber("3"); - goods4.setIconUrl("https://lpk.yyundong.com/upload/20231130/泥坑藕_20231130151949723069.jpg"); - goods4.setPrice("5"); - goods4.setSpecificationUnit("斤"); - goods4.setWeight("5"); - goods4.setTotalValue("25"); - List goodsList=new ArrayList<>(); - goodsList.add(goods); - goodsList.add(goods1); - goodsList.add(goods2); - goodsList.add(goods3); - goodsList.add(goods4); - pagging.setRecords(goodsList); - PagerVo p = PagerUtil.pageToVo(pagging, null); -// appletGiftBagVo.setGoods(goodsList); -// records.removeAll(Collections.single ton(null)); - return rb.success().setData(p); - } - public ResultBean> appletGiftBagListPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - AppletGiftBagQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("1", "1"); - if (StringUtils.isNotBlank(query.getName())) { - qw.like("name", query.getName()); - } - qw.orderByDesc("isRecommend"); - qw.orderByDesc("createTime"); - IPage page = PagerUtil.queryToPage(pq); -// IPage pagging = baseMapper.giftBagListPage(page, qw); - IPage pagging = new Page<>(); - AppletGiftBagVo appletGiftBagVo=new AppletGiftBagVo(); - appletGiftBagVo.setName("父母陪伴窖卡"); - appletGiftBagVo.setPrice("1000"); - appletGiftBagVo.setIsRecommend("1"); - appletGiftBagVo.setIconUrl("1"); - appletGiftBagVo.setRemark("送父母，不能常伴左右，就在冬日为父母送上一份暖暖孝心。"); - appletGiftBagVo.setCount("7种蔬菜"); - AppletGiftBagVo appletGiftBagVo1=new AppletGiftBagVo(); - appletGiftBagVo1.setName("亲朋关怀窖卡"); - appletGiftBagVo1.setPrice("288"); - appletGiftBagVo1.setIsRecommend("2"); - appletGiftBagVo1.setIconUrl("1"); - appletGiftBagVo1.setRemark("送亲朋，直接转发二维码，方便快捷奉上每日的贴心关怀。"); - appletGiftBagVo1.setCount("6种蔬菜"); - AppletGiftBagVo appletGiftBagVo2=new AppletGiftBagVo(); - appletGiftBagVo2.setName("关爱家人窖卡"); - appletGiftBagVo2.setPrice("1000"); - appletGiftBagVo2.setIsRecommend("2"); - appletGiftBagVo2.setIconUrl("1"); - appletGiftBagVo2.setRemark("送亲朋，直接转发二维码，方便快捷奉上每日的贴心关怀。"); - appletGiftBagVo2.setCount("6种蔬菜"); - List appletGiftBagVos=new ArrayList<>(); - appletGiftBagVos.add(appletGiftBagVo); - appletGiftBagVos.add(appletGiftBagVo1); - appletGiftBagVos.add(appletGiftBagVo2); - pagging.setRecords(appletGiftBagVos); - - PagerVo p = PagerUtil.pageToVo(pagging, null); -// records.removeAll(Collections.singleton(null)); - return rb.success().setData(p); + List list=baseMapper.getAllGoodsApplet(); + return rb.success().setData(list); } }