From 3bba8ccaea4c0ff7ad5a7acb056d554c42b2eca2 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 03 五月 2023 17:10:43 +0800
Subject: [PATCH] 小程序初步完成

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
index cb12e94..b1039ae 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
@@ -1,14 +1,14 @@
 package com.ruoyi.order.controller.miniapp;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.AppBaseBathDto;
+import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
 import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
 import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
 import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
 import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
 import com.ruoyi.order.service.goods.GoodsService;
-import com.ruoyi.order.service.goods.ShopGoodsService;
 import com.ruoyi.order.service.order.ShoppingCartService;
 import com.ruoyi.system.api.RemoteMemberService;
 import com.ruoyi.system.api.domain.poji.member.Member;
@@ -29,8 +29,8 @@
  */
 @Api(value = "小程序商品相关接口", tags = "小程序商品相关接口", description = "小程序商品相关接口")
 @RestController
-@RequestMapping("/app/home")
-public class AppGoodsController {
+@RequestMapping("/app/goods")
+public class AppGoodsController extends BaseController {
 
     @Autowired
     private GoodsService goodsService;
@@ -47,8 +47,8 @@
         Long userId = SecurityUtils.getUserId();
         if(userId!=null){
             Member member = memberService.getMember(userId).getData();
-            if(member!=null&&member.getRealtionShopId()!=null){
-                appGoodsInfoGetDto.setShopId(member.getRealtionShopId());
+            if(member!=null&&member.getRelationShopId()!=null){
+                appGoodsInfoGetDto.setShopId(member.getRelationShopId());
             }
         }
         AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
@@ -62,8 +62,8 @@
         if(userId!=null){
             Member member = memberService.getMember(userId).getData();
             appShoppingCartAddDto.setUserId(userId);
-            if(member!=null&&member.getRealtionShopId()!=null){
-                appShoppingCartAddDto.setShopId(member.getRealtionShopId());
+            if(member!=null&&member.getRelationShopId()!=null){
+                appShoppingCartAddDto.setShopId(member.getRelationShopId());
             }
         }
         shoppingCartService.addShoppingCart(appShoppingCartAddDto);
@@ -77,8 +77,8 @@
         if(userId!=null){
             Member member = memberService.getMember(userId).getData();
             appShoppingCartChangeDto.setUserId(userId);
-            if(member!=null&&member.getRealtionShopId()!=null){
-                appShoppingCartChangeDto.setShopId(member.getRealtionShopId());
+            if(member!=null&&member.getRelationShopId()!=null){
+                appShoppingCartChangeDto.setShopId(member.getRelationShopId());
             }
         }
         shoppingCartService.changeShoppingCart(appShoppingCartChangeDto);
@@ -96,4 +96,7 @@
         shoppingCartService.deleteShoppingCart(appBaseBathDto);
         return R.ok();
     }
+
+
+
 }

--
Gitblit v1.7.1