From 79ced90940d9045b8eb2f75424ac7e82c8d1bff2 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 2 Feb 2024 09:48:54 +0800
Subject: [PATCH] 2/2

---
 .../yythmall/biz/lpkgoods/LpkGoodsService.java    | 15 +++++++++++++++
 .../yythmall/biz/ordorder/OrdOrderService.java    |  6 +++---
 .../transferrecords/TransferRecordsService.java   |  3 +++
 .../VegeCellarReserveOrderService.java            |  8 ++++----
 .../vegetablecellar/VegetableCellarService.java   |  3 +++
 5 files changed, 28 insertions(+), 7 deletions(-)

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 89d807b..0c0ad79 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
@@ -214,6 +214,12 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
 
     public ResultBean  vegeCellarList(LpkGoodsQuery query) {
         ResultBean rb=new ResultBean().fail();
+        if(StringUtils.isBlank(query.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
+        if(StringUtils.isBlank(query.getAffiliation())){
+            return rb.setMsg("参数不全");
+        }
         List<MyGoodsVo> vo =baseMapper.getGoodsApplet(query);
         vo.forEach(s->{
             double i=Double.valueOf(s.getGoodsNumber());
@@ -224,6 +230,12 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
     }
     public ResultBean  vegeCellarTypeList(LpkGoodsQuery query) {
         ResultBean rb=new ResultBean().fail();
+        if(StringUtils.isBlank(query.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
+        if(StringUtils.isBlank(query.getAffiliation())){
+            return rb.setMsg("参数不全");
+        }
         List<GoodsTypeVo> vo =new ArrayList<>();
         List<BrandVo> list1= IPmsBrandService.getList().getData();
         for (BrandVo brandVo : list1) {
@@ -259,6 +271,9 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
 
     public ResultBean  getGoodsByTypeSid(LpkGiftCardQuery query) {
         ResultBean rb=new ResultBean().fail();
+        if(StringUtils.isBlank(query.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         List<GiftBagGoodss> giftBagGoodss=baseMapper.getAllGoodsApplets(query);
         ShoppingCartQuery query1=new ShoppingCartQuery();
         query1.setBrandId(query.getBrandId());
diff --git a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
index 3a1d5d4..bea5e46 100644
--- a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
+++ b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
@@ -197,7 +197,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         order.setTotalTee(dto.getTotalTee());//实付金额
         order.setMeet(removeZeros(String.valueOf(totalAmount)));//应付金额
         if(dto.getOrdOrderDetailsVoList().size()>1){
-            order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品");
+            order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size())+"件商品");
         }else{
             order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"商品");
         }
@@ -220,7 +220,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         String [] sids=strings.toArray(new String [0]);
         shoppingCartService.delBySids(sids);
         if(dto.getOrdOrderDetailsVoList().size()>1){
-            result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品");
+            result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size())+"件商品");
         }else{
             result.setGoods(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"商品");
         }
@@ -367,7 +367,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         //拼接base参数
         String name ="";
         if(detailVos.size()>1){
-            name=detailVos.get(0).getGoodsName().toString()+"等"+(detailVos.size()-1)+"件商品";
+            name=detailVos.get(0).getGoodsName().toString()+"等"+(detailVos.size())+"件商品";
         }else{
             name =detailVos.get(0).getGoodsName().toString()+"商品";
         }
diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
index 0d48de9..92d3f30 100644
--- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
@@ -86,6 +86,9 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
         ResultBean rb = new ResultBean().fail();
         TransferRecordsQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
+        if(StringUtils.isBlank(query.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         qw.eq("o.customerSid", query.getCustomerSid());
         IPage<TransferRecords> page = PagerUtil.queryToPage(pq);
         IPage<TransferRecordsVo> pagging =new Page<>();
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
index 23d982f..a1f7ea8 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
@@ -291,10 +291,10 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
             for (VegeCellarReserveDetails goods1 : goods) {
                 LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
                 OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
-//                orderGoodsVo.setGoodName(lpkGoods.getName());
-//                orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));
-//                orderGoodsVo.setUnitName(lpkGoods.getUnitName());
-//                goodsVo.add(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() + "：" + goods1.getNum() + lpkGoods.getUnitName());
                 } else {
diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
index a42859b..bbe33cf 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
@@ -169,6 +169,9 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
     @Transactional(rollbackFor = Exception.class)
     public ResultBean receiveTransferGoods(VegetableCellarDto  dto) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         TransferRecords transferRecords=transferRecordsService.getOne(new QueryWrapper<TransferRecords>().eq("sid",dto.getTransferSid()).eq("state","1"));
         if(transferRecords==null){
             return rb.setMsg("已经被领取");