From 65816321c28dab1f43d0563af67dbcbad2c5bdca Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 22 五月 2023 18:15:39 +0800
Subject: [PATCH] demo补完
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 4fd0949..36637bb 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,6 +1,7 @@
package com.ruoyi.order.controller.miniapp;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.vo.AppShoppingCartVo;
@@ -53,6 +54,8 @@
Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
appGoodsInfoGetDto.setShopId(member.getRelationShopId());
+ }else{
+ throw new ServiceException("请先获取附近商户定位");
}
}
AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
@@ -73,10 +76,10 @@
@ApiOperation(value = "添加购物车")
public R addShoppingCart(@RequestBody AppShoppingCartAddDto appShoppingCartAddDto) {
Long userId = SecurityUtils.getUserId();
- if(userId!=null){
+ if(userId != null){
Member member = memberService.getMember(userId).getData();
appShoppingCartAddDto.setUserId(userId);
- if(member!=null&&member.getRelationShopId()!=null){
+ if(appShoppingCartAddDto.getShopId()==null&&member!=null&&member.getRelationShopId()!=null){
appShoppingCartAddDto.setShopId(member.getRelationShopId());
}
}
--
Gitblit v1.7.1