修改 添加购物车接口

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

@@ -4,6 +4,7 @@ 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.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinShoppingCartVoo;
 import com.liquidnet.service.goblin.service.impl.GoblinFrontServiceImpl;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -30,65 +31,94 @@ public class GoblinFrontLoginController    {
 
     @GetMapping("addShopCart")
     @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,@RequestParam(name = "type", required = true) String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return  goblinFrontService.addShoopCart(spuId,storeId,skuId,number,userId,type);
+    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, @RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
         }
+        return goblinFrontService.addShoopCart(spuId, storeId, skuId, number, userId, type);
+    }
+
     @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,@RequestParam(name = "type", required = true) String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return ResponseDto.success( goblinFrontService.updateShopCart(spuId,storeId,skuId,number,userId,type));
+    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, @RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
+        }
+        return ResponseDto.success(goblinFrontService.updateShopCart(spuId, storeId, skuId, number, userId, type));
     }
 
 
     @GetMapping("getShopCartCount")
     @ApiOperation("获取购物车数量")
-    public ResponseDto getShopCartCount(@RequestParam(name = "type", required = true)String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return ResponseDto.success(goblinFrontService.getShopCartCount(userId,type));
+    public ResponseDto getShopCartCount(@RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
         }
+        return ResponseDto.success(goblinFrontService.getShopCartCount(userId, type));
+    }
+
     @PostMapping("deleteShopCart")
     @ApiOperation("删除购物车")
-    public ResponseDto deleteShopCart(@RequestParam(name = "skuIds", required = false) String skuIds,@RequestParam(name = "type", required = true) String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return ResponseDto.success(goblinFrontService.delteShoppingCart(skuIds.split(","),userId,type));
+    public ResponseDto deleteShopCart(@RequestParam(name = "skuIds", required = false) String skuIds, @RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
+        }
+        return ResponseDto.success(goblinFrontService.delteShoppingCart(skuIds.split(","), userId, type));
     }
+
     @PostMapping("saveData")
     @ApiOperation("保存数据购物车过度")
-    public ResponseDto saveData(@RequestParam(name = "data", required = false)String data,@RequestParam(name = "type", required = true)String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return ResponseDto.success(goblinFrontService.saveDate(data,userId,type));
+    public ResponseDto saveData(@RequestParam(name = "data", required = false) String data, @RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
+        }
+        return ResponseDto.success(goblinFrontService.saveDate(data, userId, type));
     }
+
     @PostMapping("getData")
     @ApiOperation("获得购物车过度")
-    public ResponseDto getData(@RequestParam(name = "type", required = true)String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return goblinFrontService.getDate(userId,type);
+    public ResponseDto getData(@RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
+        }
+        return goblinFrontService.getDate(userId, type);
     }
 
 
     @GetMapping("getShopCart")
     @ApiOperation("获得购物车列表")
-    public ResponseDto<GoblinShoppingCartVoo> getShopCart(@RequestParam(name = "type", required = true)String type) {
-        String userId=CurrentUtil.getCurrentUid();
-        return ResponseDto.success(goblinFrontService.getShoppCart(userId,type));
+    public ResponseDto<GoblinShoppingCartVoo> getShopCart(@RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
+        }
+        return ResponseDto.success(goblinFrontService.getShoppCart(userId, type));
     }
+
     @GetMapping("deleteShopCartTest")
     @ApiOperation("请勿调用，测试用")
-    public ResponseDto<GoblinShoppingCartVoo> deleteShopCart(@RequestParam(name = "type", required = true)String type) {
-        String userId=CurrentUtil.getCurrentUid();
+    public ResponseDto<GoblinShoppingCartVoo> deleteShopCart(@RequestParam(name = "type", required = true) String type) {
+        String userId = CurrentUtil.getCurrentUid();
+        String pre = GoblinStatusConst.MarketPreStatus.getPre(type);
+        if (pre != null) {
+            type = type.split(pre)[0];
+        }
         redisUtil.del(GoblinRedisConst.FRONT_SHOPCART.concat(userId).concat(type));
         return ResponseDto.success(null);
     }
 
 
-
-
-
-
-
-
-
-
 }