From fbd1af0c5ed9b7207c9058fae0c706ea3ccfcf6e Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 25 Sep 2019 16:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E5=9C=B0=E5=9D=80=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/app/modular/member/controller/UserController.java  | 5 +++--
 .../ruoyi/app/modular/shop/controller/MallController.java    | 2 +-
 .../app/modular/shop/service/impl/GoodsServiceImpl.java      | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/controller/UserController.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/controller/UserController.java
index 6149bba..661fd93 100644
--- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/controller/UserController.java
+++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/controller/UserController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.app.modular.member.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.itmuch.lightsecurity.annotation.PreAuthorize;
 import com.itmuch.lightsecurity.jwt.User;
 import com.itmuch.lightsecurity.jwt.UserOperator;
@@ -86,8 +87,8 @@ public class UserController {
 
     @PostMapping(value = "/shop/user-address-del")
     @ApiOperation(value = "删除地址",notes = "删除地址")
-    public R delAddress(@RequestParam(value = "address_id",defaultValue = "0") int addressId){
-
+    public R delAddress(@Validated @RequestBody String jsonStr){
+        int addressId = Integer.valueOf(JSON.parseObject(jsonStr).get("address_id").toString());
         boolean result = addressService.removeById(addressId);
         if(result){
             return R.success("操作成功");
diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/MallController.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/MallController.java
index 644b05e..9bbffae 100644
--- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/MallController.java
+++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/MallController.java
@@ -153,7 +153,7 @@ public class MallController {
     @GetMapping("/shop/mall-cart-list")
     @ApiOperation(value = "获取购物车列表",notes = "获取购物车列表")
     public R cartList(@RequestParam(value = "page",defaultValue = "0") int page,
-                      @RequestParam(value = "limit",defaultValue = "10") int limit){
+                      @RequestParam(value = "page_num",defaultValue = "10") int limit){
         int userId = userOperator.getUser().getId();
         //goodsService.cartList(pageVO,userId);
         PageVO pageVO = new PageVO();
diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java
index c10d78d..4ebb4a1 100644
--- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java
@@ -258,8 +258,9 @@ public class GoodsServiceImpl extends ServiceImpl<StoreGoodsMapper, StoreGoods>
                 .selectPage(pageModel,cartQueryWrapper);
         List<StoreCart> storeCartList = storeCarts.getRecords();
         List<CartDTO> carts = new ArrayList<>();
-        CartDTO cartDTO = new CartDTO();
+
         for (StoreCart storeCart : storeCartList) {
+            CartDTO cartDTO = new CartDTO();
             StoreGoods storeGoods = getById(storeCart.getGoodsId());
             cartDTO.setGoodsId(storeCart.getGoodsId());
             cartDTO.setGoodsName(storeGoods.getGoodsName());