From 9108fe37516a05b7af57953cb036e361ae3c86d2 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 19 Mar 2021 16:00:40 +0800
Subject: [PATCH] 积分商城8

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java |   31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java
index e01efca..0b31678 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java
@@ -17,6 +17,7 @@
 import com.matrix.system.shopXcx.dao.ShopShoppingCartDao;
 import com.matrix.system.shopXcx.dao.ShopSkuDao;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -50,12 +51,8 @@
     ShopSkuDao skuDao;
 
 
-    /**
-     * 根据ID删除购物车
-     *
-     * @param
-     * @return
-     */
+
+    @ApiOperation(value = "根据ID删除购物车", notes = "")
     @PostMapping("/deleteByCartId/{cartId}")
     @ResponseBody
     public AjaxResult deleteByCartId(@PathVariable("cartId") Integer cartId) {
@@ -66,12 +63,8 @@
         return new AjaxResult(AjaxResult.STATUS_SUCCESS, "删除成功");
     }
 
-    /**
-     * 根据用户ID查询购物车 没有分页
-     *
-     * @param
-     * @return
-     */
+
+    @ApiOperation(value = "根据用户ID查询购物车 没有分页", notes = "")
     @PostMapping("/findShoppingCart")
     @ResponseBody
     public AjaxResult getShoppingCartByUserId(@RequestBody ShopShoppingCart shoppingCart) {
@@ -86,9 +79,8 @@
         return result;
     }
 
-    /**
-     * 批量删除
-     */
+
+    @ApiOperation(value = "批量删除", notes = "")
     @PostMapping(value = "/delShoppingCart/{keys}")
     public
     @ResponseBody
@@ -102,6 +94,7 @@
         }
     }
 
+    @ApiOperation(value = "查询微商城购物车数量", notes = "")
     @PostMapping(value = "/getUserCartCount/{shopId}")
     public
     @ResponseBody
@@ -136,7 +129,6 @@
         shoppingCart.setCreateBy(loginUser.getOpenId());
         shoppingCart.setUpdateBy(loginUser.getOpenId());
         shoppingCart.setCartUserId(loginUser.getOpenId());
-        shoppingCart.setCartType(ShopShoppingCart.CAR_TYPE_MICRO);
         ShopShoppingCart shoppCartLimt = shoppingCartDao.selectBuyLimit(shoppingCart.getCartProductId(),
                 shoppingCart.getCartSkuId());
         // Integer buyLimitNum = 0;
@@ -275,13 +267,12 @@
      * @param
      * @return
      */
-    @PostMapping("/updateCartAllSelected/{shopId}/{isSelected}/{cartType}")
+    @PostMapping("/updateCartAllSelected/{shopId}/{isSelected}")
     @ResponseBody
     public AjaxResult updateCartAllSelected(@PathVariable("isSelected") Integer isSelected,
-                                            @PathVariable("shopId") Long shopId,@PathVariable("cartType") Integer cartType) {
-        Map<String, Object> modifyMap = new HashMap<>();
+                                            @PathVariable("shopId") Long shopId) {
         BizUser user = redisUserLoginUtils.getLoginUser(BizUser.class);
-        shoppingCartDao.updateAllSelected(user.getOpenId(),shopId, isSelected,cartType);
+        shoppingCartDao.updateAllSelected(user.getOpenId(),shopId, isSelected);
         return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
     }
 }

--
Gitblit v1.9.1