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/GoblinShoppingCartVo.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class GoblinShoppingCartVo implements Serializable {
-
+    @ApiModelProperty(value = "该商铺下的所有商品")
     private List<GoblinShoppingCartVoDetail> list;
     /**
      * 商铺id

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -25,6 +26,7 @@ public class GoblinShoppingCartVoDetail implements Serializable {
     /**
      * 购物车id
      */
+    @ApiModelProperty(value = "购物车id")
     private String carId;
 
     /**
@@ -35,21 +37,25 @@ public class GoblinShoppingCartVoDetail implements Serializable {
     /**
      * 商铺id
      */
+    @ApiModelProperty(value = "商铺id")
     private String storeId;
 
     /**
      * 商品id
      */
+    @ApiModelProperty(value = "商品id")
     private String spuId;
 
     /**
      * 款式id
      */
+    @ApiModelProperty(value = "款式id")
     private String skuId;
 
     /**
      * 数量
      */
+    @ApiModelProperty(value = "数量")
     private Integer number;
 
     /**
@@ -60,6 +66,7 @@ public class GoblinShoppingCartVoDetail implements Serializable {
     /**
      * 删除标记[0-未删除|1-已删除]
      */
+    @ApiModelProperty(value = "删除标记[0-未删除|1-已删除]")
     private Integer delTag;
 
     private LocalDateTime createdAt;

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,7 +18,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class GoblinShoppingCartVoo implements Serializable {
-
+  @ApiModelProperty(value = "根据shop分类")
   private  List<GoblinShoppingCartVo> list;
 
 

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.dto.vo.GoblinShoppingCartVoo;
 import com.liquidnet.service.goblin.service.impl.GoblinFrontServiceImpl;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import io.swagger.annotations.Api;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Description:前端接口
  * @date 2021/12/27 下午6:25
  */
-@Api(tags = "前端接口管理")
+@Api(tags = "前端需要登陆接口管理")
 @RestController
 @RequestMapping("/front")
 public class GoblinFrontLoginController    {
@@ -36,6 +37,14 @@ public class GoblinFrontLoginController    {
 
         return ResponseDto.success( goblinFrontService.addShoopCart(spuId,storeId,skuId,number,userId));
     }
+    @GetMapping("getShopCart")
+    @ApiOperation("获得购物车")
+    public ResponseDto<GoblinShoppingCartVoo> getShopCart() {
+        String userId=CurrentUtil.getCurrentUid();
+
+        return ResponseDto.success( );
+    }
+