购物车商品显示

src/main/java/com/izouma/dingdong/web/user/ShoppingCartController.java

@@ -1,5 +1,7 @@
 package com.izouma.dingdong.web.user;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.domain.OrderGoodsSpec;
 import com.izouma.dingdong.domain.merchant.GoodsSpecification;
 import com.izouma.dingdong.domain.user.ShoppingCart;
@@ -100,6 +102,19 @@ public class ShoppingCartController extends BaseController {
         return new PageImpl<>(carts, toPageRequest(pageQuery), pageQuery.getSize());
     }
 
+    @GetMapping("/my/merchant")
+    public List<OrderGoodsSpec> myMerchant(Long merchantId) {
+        ShoppingCart cart = shoppingCartRepo.findByUserIdAndMerchantId(SecurityUtils.getAuthenticatedUser().getId(), merchantId);
+        if (ObjectUtil.isEmpty(cart)) {
+            return null;
+        }
+        List<OrderGoodsSpec> specs = cart.getOrderGoodsSpecs();
+        if (CollUtil.isEmpty(specs)) {
+            return null;
+        }
+        return specs;
+    }
+
     //清除购物车
     @GetMapping("/clearCart")
     @ApiOperation("清除购物车")

src/main/vue/src/router.js

@@ -51,12 +51,12 @@ const router = new Router({
                 {
                     path: '/userEdit',
                     name: 'userEdit',
-                    component: () => import(/* webpackChunkName: "userEdit" */ '@/views/UserEdit.vue'),
+                    component: () => import(/* webpackChunkName: "userEdit" */ '@/views/user/UserEdit.vue'),
                 },
                 {
                     path: '/userList',
                     name: 'userList',
-                    component: () => import(/* webpackChunkName: "userList" */ '@/views/UserList.vue'),
+                    component: () => import(/* webpackChunkName: "userList" */ '@/views/user/UserList.vue'),
                 },
                 {
                     path: '/sysConfigList',
@@ -306,7 +306,7 @@ const router = new Router({
                 {
                     path: '/complaintEdit',
                     name: 'ComplaintEdit',
-                    component: () => import(/* webpackChunkName: "complaintEdit" */ '@/views/ComplaintEdit.vue'),
+                    component: () => import(/* webpackChunkName: "complaintEdit" */ '@/views/backstage/ComplaintEdit.vue'),
                     meta: {
                        title: '投诉编辑',
                     },
@@ -314,7 +314,7 @@ const router = new Router({
                 {
                     path: '/complaintList',
                     name: 'ComplaintList',
-                    component: () => import(/* webpackChunkName: "complaintList" */ '@/views/ComplaintList.vue'),
+                    component: () => import(/* webpackChunkName: "complaintList" */ '@/views/backstage/ComplaintList.vue'),
                     meta: {
                        title: '投诉',
                     },

src/main/vue/src/views/ComplaintEdit.vue → src/main/vue/src/views/backstage/ComplaintEdit.vue

@@ -7,7 +7,7 @@
             </el-form-item>
             <el-form-item prop="target" label="投诉目标">
                 <el-select v-model="formData.target" clearable filterable placeholder="请选择">
-                    <el-option
+                    <el-option disabled
                             v-for="item in targetOptions"
                             :key="item.value"
                             :label="item.label"
@@ -16,10 +16,13 @@
                 </el-select>
             </el-form-item>
             <el-form-item prop="type" label="投诉类型">
-                <el-input v-model="formData.type"></el-input>
+                <el-input v-model="formData.type" readonly></el-input>
             </el-form-item>
             <el-form-item prop="img" label="图片">
-                <multi-upload v-model="formData.img"></multi-upload>
+                <!--<multi-upload v-model="formData.img"></multi-upload>-->
+                <el-image style="width: 30px; height: 30px"
+                          :src="picList(formData.img)[0]" fit="cover"
+                          :preview-src-list="picList(row.img)?picList(row.img):[]"></el-image>
             </el-form-item>
             <el-form-item prop="content" label="内容">
                 <el-input type="textarea" v-model="formData.content"></el-input>

src/test/java/com/izouma/dingdong/service/ShoppingCartServiceTest.java

@@ -1,6 +1,9 @@
 package com.izouma.dingdong.service;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.domain.OrderGoodsSpec;
+import com.izouma.dingdong.domain.user.ShoppingCart;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.OrderGoodsSpecRepo;
 import com.izouma.dingdong.repo.user.ShoppingCartRepo;
@@ -11,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.List;
+
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class ShoppingCartServiceTest {
@@ -38,21 +43,36 @@ public class ShoppingCartServiceTest {
     }
 
     @Test
-    public void testSub(){
+    public void testSub() {
         OrderGoodsSpec add = orderGoodsSpecService.add(1636L, null, 1);
         System.out.println(shoppingCartService.add(82L, add));
         //System.out.println(shoppingCartService.sub(1500L, 83L));
     }
 
     @Test
-    public void testFalse(){
+    public void testFalse() {
         //System.out.println(shoppingCartRepo.findByIdAndEnabledIsFalse(1759L));
 
         System.out.println(shoppingCartRepo.findById(1759L).orElse(null));
     }
 
     @Test
-    public void testAgain(){
+    public void testAgain() {
         System.out.println(shoppingCartService.again(1729L));
     }
+
+    @Test
+    public void testMyMer() {
+        ShoppingCart cart = shoppingCartRepo.findByUserIdAndMerchantId(82L, 927L);
+        if (ObjectUtil.isEmpty(cart)) {
+            System.out.println("null");
+        } else {
+            List<OrderGoodsSpec> specs = cart.getOrderGoodsSpecs();
+            if (CollUtil.isEmpty(specs)) {
+                System.out.println("null");
+            } else {
+                System.out.println(specs);
+            }
+        }
+    }
 }