From 2c28da55ffa932dc96e05b167de998dde9962e43 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Thu, 3 Nov 2022 11:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8B=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsServiceImpl.java   | 20 +++++++++++++++----
 .../java/cn/chjyj/szwh/utils/SzCarUtils.java  |  3 +--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 63f6bce..8fbdb52 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -574,24 +574,28 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public Map<String, Object> addShopCar(String userIsli, String goodsIsli, Integer userYears) {
         Map<String, Object> retmap = new HashMap<>();
-        User user = userMapper.getUserByIsli(userIsli);
+        //User user = userMapper.getUserByIsli(userIsli);
         // get current goods
         Goods goods = goodsMapper.getGoodsFuelByIsLi(goodsIsli);
         if (goods == null) {
             retmap.put("code", 400);
             retmap.put("msg", "没有该标的");
+            return retmap;
         } else {
             if (goods.getGoodsStatus() != 1) {
                 retmap.put("code", 400);
                 retmap.put("msg", "该标的现不在上架中");
+                return retmap;
             }
             if (goods.getContractStatus() != 1) {
                 retmap.put("code", 400);
                 retmap.put("msg", "标的未申请合约关联，不可购买");
+                return retmap;
             }
             if (goods.getUserIslicode() == userIsli) {
                 retmap.put("code", 400);
                 retmap.put("msg", "您是标的的授权方，不可添加");
+                return retmap;
             }
         }
         //
@@ -604,12 +608,19 @@ public class GoodsServiceImpl implements GoodsService {
         if (orderDetailVo != null) {
             retmap.put("code", 400);
             retmap.put("msg", "该标的已有订单，添加购物车失败");
+            return retmap;
         }
         // goods detail
         GoodsDetail goodsDetail = goodsDetailMapper.getGoodsDetailBygid(goods.getGoodsDetailId());
+        if(goodsDetail==null){
+            retmap.put("code", 400);
+            retmap.put("msg", "该标的详情不存在，请检查标的编号");
+            return retmap;
+        }
         if (goodsDetail.getStock() <= 0 && goodsDetail.getGoodsEntrust() == 1) {
             retmap.put("code", 400);
             retmap.put("msg", "该标的已有订单，添加购物车失败");
+            return retmap;
         }
         Date now = new Date();
         if (goodsDetail.getContractualPeriod() == 3) {
@@ -618,6 +629,7 @@ public class GoodsServiceImpl implements GoodsService {
             ) {
                 retmap.put("code", 400);
                 retmap.put("msg", "标的委托已结束");
+                return retmap;
             }
         }
         //shop car infomation
@@ -643,6 +655,9 @@ public class GoodsServiceImpl implements GoodsService {
                         retmap.put("code", 400);
                         retmap.put("msg", "该标的已添加到购物车");
                         return retmap;
+                    }else{
+                        cimap.put("goods_isli",goodsIsli);
+                        cimap.put("use_years",userYears);
                     }
                 }
             }
@@ -654,9 +669,6 @@ public class GoodsServiceImpl implements GoodsService {
         }
         //购物车添加成功
         JSONObject retjson =SzCarUtils.addCart(shopRedisKey,userIsli,cimap);
-//        carjson.put("user_isli",userIsli);
-//        carjson.put("data",retjson);
-//        RedisUtil.set(shopRedisKey, carjson.toJSONString());
 
         retmap.put("code", 200);
         retmap.put("msg", "成功");
diff --git a/src/main/java/cn/chjyj/szwh/utils/SzCarUtils.java b/src/main/java/cn/chjyj/szwh/utils/SzCarUtils.java
index 1d20a3e..1e7413a 100644
--- a/src/main/java/cn/chjyj/szwh/utils/SzCarUtils.java
+++ b/src/main/java/cn/chjyj/szwh/utils/SzCarUtils.java
@@ -28,8 +28,7 @@ public class SzCarUtils {
             JSONArray jsonArray = shopCarJson.getJSONArray("data");
             if (jsonArray != null) {
                 for (int x = 0; x < jsonArray.size(); x++) {
-                    //carItem.add(jsonArray.getJSONObject(x));
-                    carItem.add(jsonArray.get(x));
+                    carItem.add((JSONObject)jsonArray.get(x));
                 }
             }
         }