From 2026350648592db5e1cce825df7266a3e9306a61 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sat, 20 Jan 2024 10:38:42 +0800 Subject: [PATCH] 1/20 --- .../VegeCellarReserveDetails.java | 3 + .../biz/lpkgiftcard/LpkGiftCardRest.java | 10 +-- .../biz/lpkgiftcard/LpkGiftCardService.java | 31 +++++----- .../biz/lpkgoods/LpkGoodsService.java | 61 ++++++++++--------- .../biz/shoppingcart/ShoppingCartService.java | 2 +- .../VegeCellarReserveDetailsService.java | 6 ++ .../mbg/pms/entity/brand/BrandVo.java | 1 + 7 files changed, 63 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/vegecallerreservedetails/VegeCellarReserveDetails.java b/src/main/java/com/yxt/yythmall/api/vegecallerreservedetails/VegeCellarReserveDetails.java index 6f9754b..f530a78 100644 --- a/src/main/java/com/yxt/yythmall/api/vegecallerreservedetails/VegeCellarReserveDetails.java +++ b/src/main/java/com/yxt/yythmall/api/vegecallerreservedetails/VegeCellarReserveDetails.java @@ -1,5 +1,6 @@ package com.yxt.yythmall.api.vegecallerreservedetails; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -20,7 +21,9 @@ public class VegeCellarReserveDetails { private String cardSid; private String goodsSid; private double goodsNumber=0; + @TableField(exist = false) private String num; + @TableField(exist = false) private String orderSid; private String goodsName; } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardRest.java index 13630e2..f893f94 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardRest.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardRest.java @@ -185,10 +185,10 @@ public class LpkGiftCardRest { // public ResultBean getAllType(@PathVariable("type") String type ) { // return lpkGiftCardService.getAllType(type); // } - @ApiOperation("根据类型查询商品") - @PostMapping("/getGoodsByType") - public ResultBean getGoodsByType(@RequestBody LpkGiftCardQuery query) { - return lpkGiftCardService. getGoodsByTypeSid(query); - } +// @ApiOperation("根据类型查询商品") +// @PostMapping("/getGoodsByType") +// public ResultBean getGoodsByType(@RequestBody LpkGiftCardQuery query) { +// return lpkGiftCardService. getGoodsByTypeSid(query); +// } } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java index 68e99e4..9d7f700 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java @@ -1731,21 +1731,22 @@ public class LpkGiftCardService extends MybatisBaseService giftBagGoodss=lpkGoodsService.getAllGoodsApplets(query).getData(); - ShoppingCartQuery query1=new ShoppingCartQuery(); - query1.setAffiliation(query.getAffiliation());query1.setCustomerSid(query.getCustomerSid()); - List l=shoppingCartService.shoppingCartList(query1).getData(); - l.forEach(s->{ - giftBagGoodss.forEach(d->{ - if(s.getGoodsSid().equals(d.getGoodsSid())){ - d.setGoodsNumber(s.getGoodsNumber()); - } - }); - }); - return rb.success().setData(giftBagGoodss); - } +// public ResultBean getGoodsByTypeSid(LpkGiftCardQuery query) { +// ResultBean rb=new ResultBean().fail(); +// List giftBagGoodss=lpkGoodsService.getAllGoodsApplets(query).getData(); +// ShoppingCartQuery query1=new ShoppingCartQuery(); +// query1.setAffiliation(query.getAffiliation());query1.setCustomerSid(query.getCustomerSid()); +// List l=shoppingCartService.shoppingCartList(query1).getData(); +// l.forEach(s->{ +// giftBagGoodss.forEach(d->{ +// if(s.getGoodsSid().equals(d.getGoodsSid())){ +// d.setGoodsNumber(s.getGoodsNumber()); +// } +// d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight())))); +// }); +// }); +// return rb.success().setData(giftBagGoodss); +// } } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java index 4ffdb1c..fc94703 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java @@ -224,30 +224,16 @@ public class LpkGoodsService extends MybatisBaseService vo =new ArrayList<>(); - GoodsTypeVo vo2=new GoodsTypeVo(); - vo2.setSid("0"); - vo2.setName("百姓菜窖"); - query.setAffiliation(vo2.getSid()); - List myGoodsVos =baseMapper.getGoodsApplet(query); - vo2.setCount(String.valueOf(myGoodsVos.size())); - - GoodsTypeVo vo3=new GoodsTypeVo(); - vo3.setSid("1"); - vo3.setName("精品菜窖"); - query.setAffiliation(vo3.getSid()); - List myGoodsVos1 =baseMapper.getGoodsApplet(query); - vo3.setCount(String.valueOf(myGoodsVos1.size())); - - GoodsTypeVo vo4=new GoodsTypeVo(); - vo4.setSid("2"); - vo4.setName("企业菜窖"); - query.setAffiliation(vo4.getSid()); - List myGoodsVos2 =baseMapper.getGoodsApplet(query); - vo4.setCount(String.valueOf(myGoodsVos2.size())); -// vo.add(vo1); - vo.add(vo2); - vo.add(vo3); - vo.add(vo4); + List list1= IPmsBrandService.getList().getData(); + for (BrandVo brandVo : list1) { + GoodsTypeVo vo1=new GoodsTypeVo(); + query.setAffiliation(brandVo.getId()); + List myGoodsVos =baseMapper.getGoodsApplet(query); + vo1.setName(brandVo.getBrandName()); + vo1.setId(brandVo.getId()); + vo1.setCount(String.valueOf(myGoodsVos.size())); + vo.add(vo1); + } return rb.success().setData(vo); } public ResultBean> getAllType() { @@ -269,15 +255,30 @@ public class LpkGoodsService extends MybatisBaseService giftBagGoodss=baseMapper.getAllGoodsApplets(query); ShoppingCartQuery query1=new ShoppingCartQuery(); - query1.setAffiliation(query.getBrandId());query1.setCustomerSid(query.getCustomerSid()); + query1.setBrandId(query.getBrandId()); + query1.setCustomerSid(query.getCustomerSid()); List l=shoppingCartService.shoppingCartList(query1).getData(); - l.forEach(s->{ + giftBagGoodss.forEach(d->{ + d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl()); +// d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight())))); + }); + if(l.size()==0){ giftBagGoodss.forEach(d->{ - if(s.getGoodsSid().equals(d.getGoodsSid())){ - d.setGoodsNumber(s.getGoodsNumber()); - } +// d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl()); + d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight())))); }); - }); + }else{ + l.forEach(s->{ + giftBagGoodss.forEach(d->{ + if(s.getGoodsSid().equals(d.getGoodsSid())){ + d.setGoodsNumber(s.getGoodsNumber()); + } +// d.setIconUrl(fileUploadComponent.getUrlPrefix()+d.getIconUrl()); + d.setMefenPrice(String.valueOf((int)(Double.valueOf(d.getPrice())* Double.valueOf(d.getWeight())))); + }); + }); + } + return rb.success().setData(giftBagGoodss); } } diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java index 1f4fa91..83fb0ce 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java +++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java @@ -60,7 +60,7 @@ public class ShoppingCartService extends MybatisBaseService> shoppingCartList(ShoppingCartQuery query) { ResultBean rb = ResultBean.fireFail(); ShoppingCart entity=new ShoppingCart(); - List list= baseMapper.ShoppingCartList(query.getCustomerSid(),query.getAffiliation()); + List list= baseMapper.ShoppingCartList(query.getCustomerSid(),query.getBrandId()); list.forEach(s->{ s.setTotalPrice(String.valueOf((int)(Double.valueOf(s.getPrice())* Double.valueOf(s.getGoodsNumber())))); s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl()); diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java index 45d1a43..493c639 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java +++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java @@ -9,12 +9,14 @@ import com.yxt.yythmall.api.customerstore.CustomerStoreDto; import com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo; import com.yxt.yythmall.api.lpkgiftcard.AppletVo; import com.yxt.yythmall.api.lpkgiftcard.GoodsVo; +import com.yxt.yythmall.api.lpkgoods.LpkGoods; import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails; import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderDto; import com.yxt.yythmall.api.vegetablecellar.VegetableCellar; import com.yxt.yythmall.biz.customerstore.CustomerStoreService; import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService; import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService; +import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +35,8 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService getReserveByCardSid(String carSid, String goodsSid) { @@ -49,8 +53,10 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService().eq("sid",goods1.getGoodsSid())); goods.setGoodsSid(goods1.getGoodsSid()); goods.setGoodsNumber(goods1.getSelect()); + goods.setGoodsName(goods2.getName()); goods.setCreateTime(new DateTime()); baseMapper.insert(goods); VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper().eq("customerSid",dto.getCustomerSid()) diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java index b55939e..a47fab7 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java +++ b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java @@ -19,4 +19,5 @@ public class BrandVo { private String qssl; @ApiModelProperty("订购协议") private String dgxy; + private String count; }