From cb42190b2525975693092d61744266ffefe7d772 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 16 Dec 2024 11:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8E=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=BB=9F=E4=B8=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ordorderdetails/OrdOrderDetail.java | 12 +++++- .../TransferRecordsGoodsDetailsVo.java | 14 +++++++ .../biz/lpkcustomer/LpkCustomerService.java | 7 +++- .../ordermall/biz/lpkcustomer/WxResult.java | 14 +++++++ .../biz/lpkgoods/LpkGoodsService.java | 1 + .../biz/ordorder/OrdOrderService.java | 12 ++++-- .../biz/refundorder/RefundOrderService.java | 20 ++++++++-- .../biz/shoppingcart/ShoppingCartService.java | 4 ++ .../transferrecords/TransferRecordsRest.java | 2 +- .../TransferRecordsService.java | 38 ++++++++++++++++--- .../TransferRecordsGoodsDetailsService.java | 11 +++++- .../VegeCellarReserveDetailsService.java | 13 ++++++- .../VegeCellarReserveOrderMapper.xml | 12 +++--- .../VegeCellarReserveOrderService.java | 16 +++++++- .../VegetableCellarService.java | 11 +++++- 15 files changed, 161 insertions(+), 26 deletions(-) create mode 100644 ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/WxResult.java diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/ordorderdetails/OrdOrderDetail.java b/ordermall/src/main/java/com/yxt/ordermall/api/ordorderdetails/OrdOrderDetail.java index c4226c9..ac8d4f4 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/ordorderdetails/OrdOrderDetail.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/ordorderdetails/OrdOrderDetail.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import java.util.UUID; @@ -33,5 +34,14 @@ public class OrdOrderDetail { @TableField(exist = false) private String specificationUnit;//份 - + @TableField(exist = false) + private String packageSpecs;//份 + @TableField(exist = false) + private double quantityOfPackage;//份 + @TableField(exist = false) + private String packUnit;//份 + @TableField(exist = false) + private BigDecimal packprice;//份 + @TableField(exist = false) + private String weight;//份 } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java b/ordermall/src/main/java/com/yxt/ordermall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java index 0f394d3..d424f61 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java +++ b/ordermall/src/main/java/com/yxt/ordermall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsVo.java @@ -1,10 +1,12 @@ package com.yxt.ordermall.api.transferrecordsgoodsdetails; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import com.yxt.ordermall.api.vegecallerreserveorder.OrderGoodsVo; import lombok.Data; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,4 +44,16 @@ public class TransferRecordsGoodsDetailsVo implements Vo { private String linkPhone; private String address; private String cardType; + @TableField(exist = false) + private String packageSpecs;//份 + @TableField(exist = false) + private double quantityOfPackage;//份 + @TableField(exist = false) + private String packUnit;//份 + @TableField(exist = false) + private BigDecimal packprice;//份 + @TableField(exist = false) + private String weight;//份 + private String unitName; + private String specificationUnit; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/LpkCustomerService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/LpkCustomerService.java index cbb43e4..8ab3865 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/LpkCustomerService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/LpkCustomerService.java @@ -93,7 +93,12 @@ public class LpkCustomerService extends MybatisBaseService map = new HashMap<>(); map.put("unionid",unionid); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/WxResult.java b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/WxResult.java new file mode 100644 index 0000000..b875a3a --- /dev/null +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkcustomer/WxResult.java @@ -0,0 +1,14 @@ +package com.yxt.ordermall.biz.lpkcustomer; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/12/16 11:00 + */ +@Data +public class WxResult { + private String unionid; + private String openid; + private String session_key; +} diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java index 5ec216b..ac7f4ee 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/lpkgoods/LpkGoodsService.java @@ -411,6 +411,7 @@ public class LpkGoodsService extends MybatisBaseService().eq("sid", detail.getGoodsSid())); if(StringUtils.isNotBlank(goodsBySkuSid.getData().getPicUrl())){ detail.setPicUrl(fileUploadComponent.getUrlPrefix() + goodsBySkuSid.getData().getPicUrl()); - detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份"); - detail.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); - detail.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit()); } + detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart())) + "斤/份，" + "共" + detail.getPartNumber() + "份"); + detail.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); + detail.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit()); + detail.setPackageSpecs((goodsBySkuSid.getData().getSPackageSpecs())); + detail.setPackprice((goodsBySkuSid.getData().getSPackPrice())); + detail.setPackUnit((goodsBySkuSid.getData().getSPackUnit())); + detail.setQuantityOfPackage(goodsBySkuSid.getData().getSQuantityOfPackage()); + detail.setWeight(goodsBySkuSid.getData().getTitle()); + } pagging.setOrdOrderDetails(details); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/refundorder/RefundOrderService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/refundorder/RefundOrderService.java index d137ab1..4dbee6b 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/refundorder/RefundOrderService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/refundorder/RefundOrderService.java @@ -12,10 +12,12 @@ import com.yxt.ordermall.api.refundorder.RefundOrderDto; import com.yxt.ordermall.api.vegetablecellar.VegetableCellar; import com.yxt.ordermall.api.vegetablecellar.VegetableCellarDto; import com.yxt.ordermall.api.vegetablecellar.vegeVo; +import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo; import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService; import com.yxt.ordermall.biz.ordorder.OrdOrderService; import com.yxt.ordermall.biz.ordorderdetails.OrdOrderDetailService; import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService; +import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -43,6 +45,8 @@ public class RefundOrderService extends MybatisBaseService() - .eq("sid",detail.getGoodsSid()) + .eq("skuSid",detail.getGoodsSid()) .apply("date_format(periodValidity,'%Y-%m-%d') >= date_format ('"+sdf.format(new Date())+"','%Y-%m-%d')")); if(goods==null){ return rb.setMsg(detail.getGoodsName()+"商品不在有效期内，无法退款"); @@ -108,7 +112,12 @@ public class RefundOrderService extends MybatisBaseService().eq("mainSid",mainSid)); List detailList=ordOrderDetailService.list(new QueryWrapper().eq("orderSid",order.getSid())); for(OrdOrderDetail detail:detailList){ - LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper().eq("sid",detail.getGoodsSid())); + LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",detail.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } + cl.setBrandId(goodsBySkuSid.getData().getBrandSid()); VegetableCellar vegetableCellar=vegetableCellarService.getOne(new QueryWrapper().eq("customerSid",order.getUserSid()) .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",cl.getBrandId())); // if(vegetableCellar.getGoodsNumber().equals(String.valueOf(detail.getPartNumber()))){ @@ -126,7 +135,12 @@ public class RefundOrderService extends MybatisBaseService detailList=ordOrderDetailService.list(new QueryWrapper().eq("orderSid",order.getSid())); List vos =new ArrayList<>(); for (OrdOrderDetail detail : detailList) { - LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",detail.getGoodsSid())); + LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",detail.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } + goods.setBrandId(goodsBySkuSid.getData().getBrandSid()); vegeVo vo=new vegeVo(); vo.setBrandId(String.valueOf(goods.getBrandId())); vo.setGoodsSid(detail.getGoodsSid()); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java index 4da1961..482bf4b 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/shoppingcart/ShoppingCartService.java @@ -88,6 +88,9 @@ public class ShoppingCartService extends MybatisBaseService list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId()); List collect = list.stream().map(s -> s.getGoodsSid()).collect(Collectors.toList()); + if(collect.size()==0){ + return rb.success().setData(list); + } ResultBean> goodsInSkuSid = baseGoodsSkuFeign.getGoodsInSkuSid(collect); if(!goodsInSkuSid.getCode().equals("200")){ rb.setCode(goodsInSkuSid.getCode()); @@ -100,6 +103,7 @@ public class ShoppingCartService extends MybatisBaseService vos=new ArrayList<>(); for (TransferRecordsGoodsDetails transferRecordsGoodsDetails : list) { TransferRecordsGoodsDetailsVo vo=new TransferRecordsGoodsDetailsVo(); - LpkGoods k=lpkGoodsService.getOne(new QueryWrapper().eq("sid",transferRecordsGoodsDetails.getGoodsSid())); + LpkGoods k=lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",transferRecordsGoodsDetails.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(transferRecordsGoodsDetails.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } + k.setName(goodsBySkuSid.getData().getGoodsName()); transferRecordsGoodsDetails.setGoodsName(k.getName()); // transferRecordsGoodsDetails.setRemarks(DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()))+"份"); BeanUtil.copyProperties(transferRecordsGoodsDetails,vo); - vo.setGoodsContent(k.getContent()); +// vo.setGoodsContent(k.getContent()); vo.setGoodsFs("共"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()))+"份"); - vo.setGoodsJs("合计"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()*Double.valueOf(k.getWeight())))+"斤"); - vo.setPrice(DoubleUtils.removeZeros(String.valueOf(Double.valueOf(k.getPrice())*Double.valueOf(k.getWeight())))+"元/斤"); - vo.setGoodsPicUrl(fileUploadComponent.getUrlPrefix()+k.getPicUrl()); +// vo.setGoodsJs("合计"+DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()*Double.valueOf(k.getWeight())))+"斤"); +// vo.setPrice(DoubleUtils.removeZeros(String.valueOf(Double.valueOf(k.getPrice())*Double.valueOf(k.getWeight())))+"元/斤"); + vo.setGoodsPicUrl(fileUploadComponent.getUrlPrefix()+goodsBySkuSid.getData().getPicUrl()); + vo.setPackageSpecs(goodsBySkuSid.getData().getSPackageSpecs()); + vo.setPackprice(goodsBySkuSid.getData().getSPackPrice()); + vo.setPackUnit(goodsBySkuSid.getData().getSPackUnit()); + vo.setQuantityOfPackage(goodsBySkuSid.getData().getSQuantityOfPackage()); + vo.setWeight(goodsBySkuSid.getData().getTitle()); + vo.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); + vo.setSpecificationUnit(goodsBySkuSid.getData().getSPackUnit()); vos.add(vo); } transferRecordsVo.setList(vos); @@ -117,12 +133,22 @@ public class TransferRecordsService extends MybatisBaseService goods =transferRecordsGoodsDetailsService.selByOrderSids(vo.getSid()); for(TransferRecordsGoodsDetails goods1:goods){ - LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",goods1.getGoodsSid())); + LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",goods1.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } + if(lpkGoods==null){ + continue; + } + lpkGoods.setName(goodsBySkuSid.getData().getGoodsName()); + lpkGoods.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); // OrderGoodsVo orderGoodsVo=new OrderGoodsVo(); // orderGoodsVo.setGoodName(lpkGoods.getName()); // orderGoodsVo.setNum(Integer.parseInt(goods1.getNum())); // orderGoodsVo.setUnitName(lpkGoods.getUnitName()); // goodsVo.add(orderGoodsVo); + if(StringUtils.isBlank(vo.getGoodss())){ vo.setGoodss(lpkGoods.getName()+"："+removeZeros(String.valueOf(goods1.getGoodsNumber()))+lpkGoods.getUnitName()); }else{ diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsService.java index e3c2887..d243c99 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/transferrecordsgoodsdetails/TransferRecordsGoodsDetailsService.java @@ -10,8 +10,10 @@ import com.yxt.ordermall.api.lpkgoods.LpkGoods; import com.yxt.ordermall.api.transferrecords.TransferRecordsDto; import com.yxt.ordermall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetails; import com.yxt.ordermall.api.vegetablecellar.VegetableCellar; +import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo; import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService; import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService; +import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +30,8 @@ public class TransferRecordsGoodsDetailsService extends MybatisBaseService getReserveByCardSid(String carSid, String goodsSid) { ResultBean rb = new ResultBean(); @@ -47,7 +51,12 @@ public class TransferRecordsGoodsDetailsService extends MybatisBaseService().eq("sid",goods1.getGoodsSid())); + LpkGoods l= lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",goods1.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return rb.setMsg(goodsBySkuSid.getCode()); + } + l.setBrandId(goodsBySkuSid.getData().getBrandSid()); VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper().eq("customerSid",dto.getCustomerSid()) .eq("goodsSid",goods1.getGoodsSid()).eq("affiliation",l.getBrandId())).get(0); double d=Double.valueOf(vegetableCellar.getGoodsNumber()); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java index 82aa087..60e01de 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java @@ -12,8 +12,10 @@ import com.yxt.ordermall.api.vegecallerreservedetails.VegeCellarReserveDetails; import com.yxt.ordermall.api.vegecallerreserveorder.VegeCellarReserveOrderDto; import com.yxt.ordermall.api.vegetablecellar.VegetableCellar; import com.yxt.ordermall.biz.customerstore.CustomerStoreService; +import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo; import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService; import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService; +import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +34,8 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService getReserveByCardSid(String carSid, String goodsSid) { @@ -48,12 +52,17 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService().eq("sid",goods1.getGoodsSid())); + LpkGoods goods2=lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",goods1.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } goods.setGoodsSid(goods1.getGoodsSid()); goods.setGoodsNumber(goods1.getSelect()); - goods.setGoodsName(goods2.getName()); + goods.setGoodsName(goodsBySkuSid.getData().getGoodsName()); goods.setCreateTime(new DateTime()); goods.setOrderSid(dto.getOrderSid()); + goods2.setBrandId(goodsBySkuSid.getData().getBrandSid()); baseMapper.insert(goods); VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper().eq("customerSid",dto.getCustomerSid()) .eq("goodsSid",goods1.getGoodsSid()).eq("affiliation",goods2.getBrandId())).get(0); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml index 6c38a0d..9952b42 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml @@ -14,8 +14,8 @@ o.userName, o.userPhone, case o.state - when 0 then '待提菜' - when 1 then '已提菜' + when 0 then '待提货' + when 1 then '已提货' end stateValue , case o.affiliation when 1001000 then '百姓菜窖' @@ -99,7 +99,7 @@ LEFT JOIN lpk_store ls ON ls.sid=vo.storeSid LEFT JOIN lpk_bank lb ON lb.sid=ls.bankSid left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid - left join lpk_goods lg on vd.goodsSid=lg.sid + left join lpk_goods lg on vd.goodsSid=lg.skuSid left join pms_brand pb on pb.id=vo.affiliation LEFT JOIN lpk_customer lc ON lc.sid=vo.customerSid LEFT JOIN lpk_customer_bank lcb ON lcb.sid = lc.customerBankSid @@ -130,7 +130,7 @@ LEFT JOIN lpk_store ls ON ls.sid=vo.storeSid LEFT JOIN lpk_bank lb ON lb.sid=ls.bankSid left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid - left join lpk_goods lg on vd.goodsSid=lg.sid + left join lpk_goods lg on vd.goodsSid=lg.skuSid left join pms_brand pb on pb.id=vo.affiliation ${ew.sqlSegment} @@ -155,7 +155,7 @@ LEFT JOIN lpk_store ls ON ls.sid=vo.storeSid LEFT JOIN lpk_bank lb ON lb.sid=ls.bankSid left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid - left join lpk_goods lg on vd.goodsSid=lg.sid + left join lpk_goods lg on vd.goodsSid=lg.skuSid left join pms_brand pb on pb.id=vo.affiliation ${ew.sqlSegment} @@ -173,7 +173,7 @@ sum(vd.goodsNumber) goodsNumber from vege_cellar_reserve_order vo left join vege_cellar_reserve_details vd on vo.sid=vd.orderSid - left join lpk_goods lg on vd.goodsSid=lg.sid + left join lpk_goods lg on vd.goodsSid=lg.skuSid left join pms_brand pb on pb.id=vo.affiliation ${ew.sqlSegment} diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java index 7a97d3f..5dd0d41 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java @@ -21,11 +21,13 @@ import com.yxt.ordermall.api.vegecallerreserveorder.*; import com.yxt.ordermall.api.vegetablecellar.VegetableCellarDto; import com.yxt.ordermall.api.vegetablecellar.vegeVo; import com.yxt.ordermall.biz.cannotreservedictionary.CannotReserveDictionaryService; +import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo; import com.yxt.ordermall.biz.lpkgiftcard.generateRule.UniqueIdGenerator; import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService; import com.yxt.ordermall.biz.lpkstore.LpkStoreService; import com.yxt.ordermall.biz.vegecallerreservedetail.VegeCellarReserveDetailsService; import com.yxt.ordermall.biz.vegetablecellar.VegetableCellarService; +import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -55,6 +57,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService goods = vegeCellarReserveDetailsService.selByOrderSids(vo.getSid()); List goodsVo = new ArrayList<>(); for (VegeCellarReserveDetails goods1 : goods) { - LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", goods1.getGoodsSid())); + LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper().eq("skuSid", goods1.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(goods1.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + rb.setMsg(goodsBySkuSid.getMsg()); + return rb; + } + if(null==lpkGoods){ + continue; + } + lpkGoods.setName(goodsBySkuSid.getData().getGoodsName()); + lpkGoods.setUnitName(goodsBySkuSid.getData().getGoodsUnitName()); OrderGoodsVo orderGoodsVo=new OrderGoodsVo(); orderGoodsVo.setGoodName(lpkGoods.getName()); orderGoodsVo.setNum(Integer.parseInt(goods1.getNum())); diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegetablecellar/VegetableCellarService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegetablecellar/VegetableCellarService.java index d905044..9c9fef4 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegetablecellar/VegetableCellarService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegetablecellar/VegetableCellarService.java @@ -14,6 +14,7 @@ import com.yxt.ordermall.api.shoppingcart.ShoppingCart; import com.yxt.ordermall.api.transferrecords.TransferRecords; import com.yxt.ordermall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetails; import com.yxt.ordermall.api.vegetablecellar.*; +import com.yxt.ordermall.biz.func.basegoodssku.GoodsSkuDetailVo; import com.yxt.ordermall.biz.lpkcustomer.LpkCustomerService; import com.yxt.ordermall.biz.lpkgoods.LpkGoodsService; import com.yxt.ordermall.biz.newcomerrecorecord.NewcomerRecoRecordService; @@ -23,6 +24,7 @@ import com.yxt.ordermall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetai import com.yxt.ordermall.biz.shoppingcart.ShoppingCartService; import com.yxt.ordermall.biz.transferrecords.TransferRecordsService; import com.yxt.ordermall.biz.transferrecordsgoodsdetails.TransferRecordsGoodsDetailsService; +import com.yxt.ordermall.feign.base.basegoodssku.BaseGoodsSkuFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -58,6 +60,8 @@ public class VegetableCellarService extends MybatisBaseServicelist=transferRecordsGoodsDetailsService.list(new QueryWrapper().eq("orderSid",dto.getTransferSid())); for(TransferRecordsGoodsDetails detail:list){ - LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper().eq("sid",detail.getGoodsSid())); + LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper().eq("skuSid",detail.getGoodsSid())); + ResultBean goodsBySkuSid = baseGoodsSkuFeign.getGoodsBySkuSid(detail.getGoodsSid()); + if(!goodsBySkuSid.getCode().equals("200")){ + return goodsBySkuSid; + } + cl.setBrandId(goodsBySkuSid.getData().getBrandSid()); VegetableCellar vegetableCellar=baseMapper.selectOne(new QueryWrapper().eq("customerSid",dto.getCustomerSid()) .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",cl.getBrandId())); if(vegetableCellar==null){