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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinShoppingCartVoDetail.java

@@ -74,6 +74,14 @@ public class GoblinShoppingCartVoDetail implements Serializable {
     private LocalDateTime updatedAt;
 
     private String comment;
+    /***
+     * sku
+     */
+    @ApiModelProperty(value = "sku信息")
+    private  GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo;
+
+    @ApiModelProperty(value = "spu信息")
+    private GoblinGoodsInfoVo goblinGoodsInfoVo;
     private static final GoblinShoppingCartVoDetail obj = new GoblinShoppingCartVoDetail();
     public static GoblinShoppingCartVoDetail getNew() {
         try {

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -104,6 +104,7 @@ liquidnet:
         pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://ttestorder.zhengzai.tv/order/order/syncOrder
+        goblinUrl: http://ttestorder.zhengzai.tv/order/goblin/syncOrder
     dragon:
       notifyUrl: https://ttestdragon.zhengzai.tv/dragon
       urls:

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

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "前端需要登陆接口管理")
 @RestController
-@RequestMapping("/front")
+@RequestMapping("/frontLogin")
 public class GoblinFrontLoginController    {
     @Autowired
     private RedisUtil redisUtil;
@@ -35,15 +35,20 @@ public class GoblinFrontLoginController    {
     @ApiOperation("加入购物车")
     public ResponseDto addShopCart(@RequestParam(name = "spuId", required = true) String spuId,@RequestParam(name = "storeId", required = true) String storeId,@RequestParam(name = "skuId", required = true) String skuId,@RequestParam(name = "number", required = false) Integer number) {
         String userId=CurrentUtil.getCurrentUid();
-
         return ResponseDto.success( goblinFrontService.addShoopCart(spuId,storeId,skuId,number,userId));
     }
+    @GetMapping("updateShopCart")
+    @ApiOperation("修改购物车")
+    public ResponseDto updateShopCart(@RequestParam(name = "spuId", required = true) String spuId,@RequestParam(name = "storeId", required = true) String storeId,@RequestParam(name = "skuId", required = true) String skuId,@RequestParam(name = "number", required = false) Integer number) {
+        String userId=CurrentUtil.getCurrentUid();
+        return ResponseDto.success( goblinFrontService.updateShopCart(spuId,storeId,skuId,number,userId));
+    }
+
     @GetMapping("getShopCart")
-    @ApiOperation("获得购物车")
+    @ApiOperation("获得购物车列表")
     public ResponseDto<GoblinShoppingCartVoo> getShopCart() {
         String userId=CurrentUtil.getCurrentUid();
-        redisUtil.del(GoblinRedisConst.FRONT_SHOPCART.concat(userId));
-        return ResponseDto.success( );
+        return ResponseDto.success((GoblinShoppingCartVoo)redisUtil.get(GoblinRedisConst.FRONT_SHOPCART.concat(userId)));
     }
 
 
@@ -53,4 +58,5 @@ public class GoblinFrontLoginController    {
 
 
 
+
 }

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

@@ -414,7 +414,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 }
             }
             //调用储存方法
-            //setRedisMongodbMysqlShop(goblinShoppingCartVoo,userId);
+            saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId);
         }
         return true;
     }
@@ -426,6 +426,16 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     public GoblinShoppingCartVoo getShoppCart(String userId){
         //判断该用户 redis里是否有购物车
         GoblinShoppingCartVoo goblinShoppingCartVoo= (GoblinShoppingCartVoo) redisUtil.get(GoblinRedisConst.FRONT_SHOPCART.concat(userId));
+        //遍历里面信息
+        for(GoblinShoppingCartVo goblinShoppingCartVo:goblinShoppingCartVoo.getShopList()){
+            for(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail:goblinShoppingCartVo.getSkuList()){
+                //找到对应的  spu  和 sku
+                GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinShoppingCartVoDetail.getSpuId());
+                GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVo(goblinShoppingCartVoDetail.getSkuId());
+
+            }
+        }
+
         return goblinShoppingCartVoo;
     }
     public GoblinShoppingCartVoDetail setValue(String userId,String storeId,String spuId,String skuId,Integer number){