From cd0e5c4c266b6faae3531712f5d2859f14ce5224 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Mon, 5 May 2025 00:02:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=95=86=E5=AE=B6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/apiService/impl/OrderServiceImpl.java  |  1 +
 .../modules/apiService/impl/ShopServiceImpl.java   | 52 +++++++++++++++++-----
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
index 9a6f8dd..849d1ed 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
@@ -172,6 +172,7 @@ public class OrderServiceImpl implements OrderService {
                         balance = balance.subtract(amount);
                     }
                     //修改用户余额
+                    hanHaiMember.setPrice(balance);
                     hanHaiMemberService.updateById(hanHaiMember);
 
                     //修改订单信息
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java
index d5d0603..15f640d 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.ShopService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.massageShop.entity.MassageShop;
 import org.jeecg.modules.massageShop.service.IMassageShopService;
 import org.springframework.stereotype.Service;
@@ -15,7 +17,10 @@ import javax.annotation.Resource;
 @Service
 public class ShopServiceImpl implements ShopService {
     /******************************************************************************************************************/
-    //推拿项目信息
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //商家信息
     @Resource
     private IMassageShopService massageShopService;
     /******************************************************************************************************************/
@@ -64,13 +69,15 @@ public class ShopServiceImpl implements ShopService {
     //查看商家详情
     @Override
     public Result<?> queryShopById(String token, String id) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //返回信息
         String massege = "";
 
         try{
             MassageShop one = massageShopService
                     .lambdaQuery()
-                    .eq(MassageShop::getId, id)
+                    .eq(MassageShop::getUserId, hanHaiMember.getId())
                     .one();
 
             return Result.OK("商家详情", one);
@@ -83,20 +90,43 @@ public class ShopServiceImpl implements ShopService {
     //新增商家信息
     @Override
     public Result<?> addShop(String token, MassageShop massageShop) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //返回信息
         String massege = "";
 
         try{
-            //执行新增操作
-            boolean result = massageShopService.save(massageShop);
-
-            //判断是否新增成功
-            if(result){
-                return Result.OK("商家信息添加成功");
+            //判断用户是否已增加过商家信息
+            MassageShop one = massageShopService
+                    .lambdaQuery()
+                    .eq(MassageShop::getUserId, hanHaiMember.getId())
+                    .one();
+            if(null == one){
+                //执行新增操作
+                massageShop.setUserId(hanHaiMember.getId());
+                boolean result = massageShopService.save(massageShop);
+                //判断是否新增成功
+                if(result){
+                    return Result.OK("商家信息添加成功");
+                }else {
+                    return Result.OK("商家信息添加失败");
+                }
             }else {
-                return Result.OK("商家信息添加失败");
+                //执行修改操作
+                massageShop.setId(one.getId());
+                boolean result = massageShopService.updateById(massageShop);
+
+                //判断是否新增成功
+                if(result){
+                    return Result.OK("商家信息修改成功");
+                }else {
+                    return Result.OK("商家信息修改失败");
+                }
             }
 
+
+
+
         }catch (Exception e){
             e.printStackTrace();
             return Result.error("商家信息添加失败");
@@ -106,11 +136,13 @@ public class ShopServiceImpl implements ShopService {
     //修改商家信息
     @Override
     public Result<?> updateShop(String token, MassageShop massageShop) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //返回信息
         String massege = "";
 
         try{
-            //执行新增操作
+            //执行修改操作
             boolean result = massageShopService.updateById(massageShop);
 
             //判断是否新增成功