From 8bd65ed0eab661b4d76c26650be445686f889ca5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 12:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java      |    1 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java                   |    9 +++-
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java             |    8 ++++
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java          |    2 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java          |    1 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java              |   20 ++++++++++
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java               |    7 +++
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java             |    6 +-
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java             |    4 +
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java |   14 ++++--
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java        |    5 ++
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml              |    4 +-
 12 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index 137909e..5b04d51 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -65,6 +65,11 @@
             }
     
             @Override
+            public R<SysUser> queryUserByUserNameAndRoleType(String userName, Integer roleType) {
+                return R.fail("通过账号和账号权限查询用户失败:" + cause.getMessage());
+            }
+    
+            @Override
             public R addSysUser(SysUser user) {
                 return R.fail("添加用户失败:" + cause.getMessage());
             }
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 5211136..7ba00b0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -74,6 +74,14 @@
     R<SysUser>  queryUserByUserName(@RequestBody String userName);
     
     /**
+     * 通过账号和账号权限查询用户
+     * @param userName
+     * @return
+     */
+    @PostMapping("/user/queryUserByUserNameAndRoleType")
+    R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType);
+    
+    /**
      * 新增加用户信息
      * @param user
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 8fa9afa..2f17c3a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -571,6 +571,8 @@
     public R<SysUser> queryUserByUserName(@RequestBody String userName){
         SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                 .eq(SysUser::getUserName, userName)
+                .eq(SysUser::getDelFlag, "0")
+                .eq(SysUser::getStatus, 0)
                 .last("LIMIT 1"));
         return R.ok(user);
     }
@@ -696,4 +698,22 @@
         Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
         return R.ok(rolePerms);
     }
+    
+    
+    
+    /**
+     * 通过账号和账号权限查询用户
+     * @param userName
+     * @return
+     */
+    @PostMapping("/queryUserByUserNameAndRoleType")
+    public R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType){
+        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
+                .eq(SysUser::getUserName, userName)
+                .eq(SysUser::getDelFlag, "0")
+                .eq(SysUser::getStatus, 0)
+                .eq(SysUser::getRoleType, roleType)
+                .last("LIMIT 1"));
+        return R.ok(user);
+    }
 }
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
index 9af80f7..f1db46f 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
@@ -30,8 +30,8 @@
             tbcr.change_type,
             tbcr.create_time,
             tbcr.change_amount,
-        tbcr.beforeAmount,
-        tbcr.afterAmount
+        tbcr.before_amount,
+        tbcr.after_amount
         FROM
             t_balance_change_record tbcr
                 LEFT JOIN t_app_user tau ON tbcr.app_user_id = tau.id
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index e345abc..a53dea7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -91,9 +91,9 @@
 		if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
 			return R.fail("售后取消失败");
 		}
-//		refundPass.setDelFlag(1);
-		refundPassService.removeById(id);
-		order.setOrderStatus(4);
+		refundPass.setDelFlag(1);
+		refundPassService.updateById(refundPass);
+		order.setOrderStatus(order.getOldOrderStatus());
 		orderService.updateById(order);
 		return R.ok();
 	}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
index 9960d13..bd55d78 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
@@ -313,7 +313,7 @@
                 //添加积分明细
                 if(!shopAppUser.getLavePoint().equals(lavePoint)){
                     UserPoint userPoint = new UserPoint();
-                    userPoint.setType(9);
+                    userPoint.setType(8);
                     userPoint.setHistoricalPoint(lavePoint);
                     userPoint.setVariablePoint(hxmd_point);
                     userPoint.setBalance(shopAppUser.getLavePoint());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index ded5565..6e38450 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -209,6 +209,13 @@
         orderDetailVO.setShopId(shop.getId());
         orderDetailVO.setTechnicianName(technician.getName());
         orderDetailVO.setTechnicianId(technician.getId());
+        if(order.getOrderType() == 1){
+            List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+            if(data.size() > 0){
+                Long id = data.get(0).getId();
+                orderDetailVO.setTechnicianSubscribeId(id.toString());
+            }
+        }
         return orderDetailVO;
     }
 
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
index 89470c5..8572df7 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
@@ -155,6 +155,7 @@
         if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())&&StringUtils.isNotEmpty(goodsEvaluate.getUserName())){
             // 取交集
             usersNameList.retainAll(usersPhoneList);
+            if (usersNameList.isEmpty())usersNameList.add(-1L);
         }else{
             usersNameList.addAll(usersPhoneList);
         }
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
index b9a0f91..0cbb3c5 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -200,6 +200,7 @@
 				.gt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, LocalDateTime.now())
 				.ge(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, LocalDateTime.now())
 				.lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getStartTime, LocalDateTime.now())
+				.lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 2, OrderActivityInfo::getEndTime, LocalDateTime.now())
 				.eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()).orderByDesc(OrderActivityInfo::getCreateTime)
 				.orderByDesc(OrderActivityInfo::getCreateTime))
 				;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 561ee8c..20e4f61 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -134,13 +134,15 @@
             throw new RuntimeException("添加失败");
         }
         //添加门店后台账号和门店关系数据
-        SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+        SysUser sysUser = sysUserClient.queryUserByUserNameAndRoleType(phone, 2).getData();
         if(null != sysUser){
+            sysUser.setAppUserId(appUser.getId());
+            sysUserClient.updateUser(sysUser);
+            
             UserShop userShop = new UserShop();
             userShop.setUserId(sysUser.getUserId());
             userShop.setShopId(shopId);
             userShop.setRoleType(1);
-            userShop.setNickName(sysUser.getNickName());
             List<UserShop> data = userShopClient.getUserShop(userShop).getData();
             if(null == data || data.size() == 0){
                 userShop = new UserShop();
@@ -148,6 +150,7 @@
                 userShop.setShopId(shopId);
                 userShop.setRoleType(1);
                 userShop.setRoleId(2L);
+                userShop.setNickName(sysUser.getNickName());
                 userShop.setCreateTime(LocalDateTime.now());
                 userShopClient.saveUserShop(userShop);
             }
@@ -173,6 +176,8 @@
             userShop.setShopId(shopId);
             userShop.setRoleType(1);
             userShop.setRoleId(2L);
+            userShop.setNickName(sysUser.getNickName());
+            userShop.setCreateTime(LocalDateTime.now());
             userShopClient.saveUserShop(userShop);
         }
 
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
index c544de9..cac368d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
@@ -110,7 +110,9 @@
         }else {
             Technician byId = technicianService.getById(technician.getId());
             if (byId.getPhone()!=technician.getPhone()){
-                List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list();
+                List<Technician> list = technicianService.lambdaQuery()
+                        .eq(Technician::getPhone, technician.getPhone())
+                        .ne(Technician::getId, byId.getId()).list();
                 if (!list.isEmpty()) {
                     return R.fail("当前号码已经添加");
                 }
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 3fd7867..3bc5b95 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -98,12 +98,16 @@
 
     @Override
     public void switchingTechnician(TechnicianSubscribe technicianSubscribe) {
-        TechnicianSubscribe subscribe = this.getById(technicianSubscribe.getId());
-        if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
-            throw new RuntimeException("不能切换相同的技师");
+        List<TechnicianSubscribe> list = this.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getOrderId, technicianSubscribe.getOrderId())
+                .eq(TechnicianSubscribe::getDelFlag, 0).eq(TechnicianSubscribe::getStatus, 0));
+        for (TechnicianSubscribe subscribe : list) {
+            if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
+                throw new RuntimeException("不能切换相同的技师");
+            }
+            subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
+            this.updateById(subscribe);
         }
-        subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
-        this.updateById(subscribe);
+
     }
 
     /**

--
Gitblit v1.7.1