Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontLoginController.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.controller;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinShoppingCartVoo;
 import com.liquidnet.service.goblin.service.impl.GoblinFrontServiceImpl;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -73,6 +74,13 @@ public class GoblinFrontLoginController    {
         String userId=CurrentUtil.getCurrentUid();
         return ResponseDto.success(goblinFrontService.getShoppCart(userId,type));
     }
+    @GetMapping("deleteShopCart")
+    @ApiOperation("请勿调用，测试用")
+    public ResponseDto<GoblinShoppingCartVoo> deleteShopCart(@RequestParam(name = "type", required = true)String type) {
+        String userId=CurrentUtil.getCurrentUid();
+        redisUtil.del(GoblinRedisConst.FRONT_SHOPCART.concat(userId).concat(type));
+        return ResponseDto.success(null);
+    }
 
 
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -989,7 +989,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         }
         //遍历里面信息
         for(GoblinShoppingCartVo goblinShoppingCartVo:goblinShoppingCartVoo.getShopList()){
-            goblinShoppingCartVo.setStoreName(goblinRedisUtils.getStoreInfoVo(goblinShoppingCartVo.getStoreId()).getStoreName());
+            if(null!=goblinRedisUtils.getStoreInfoVo(goblinShoppingCartVo.getStoreId())){
+                goblinShoppingCartVo.setStoreName(goblinRedisUtils.getStoreInfoVo(goblinShoppingCartVo.getStoreId()).getStoreName());
+            }
             for(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail:goblinShoppingCartVo.getSkuList()){
                 //找到对应的  spu  和 sku
                 GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinShoppingCartVoDetail.getSpuId());