Browse Source

fix:修改中台意见反馈绑定userid

penghao 5 days ago
parent
commit
8eceb80e0e

+ 4 - 4
alien-entity/src/main/resources/mapper/LifeFeedbackMapper.xml

@@ -97,8 +97,8 @@
     <select id="selectWebFeedbackList" resultType="shop.alien.entity.store.vo.LifeFeedbackListVo">
         SELECT
             f.id,
-            u.user_name AS nickName,
-            u.user_phone AS phone,
+            u.nick_name AS nickName,
+            u.phone AS phone,
             f.feedback_type AS feedbackType,
             CASE f.feedback_type
                 WHEN 0 THEN 'bug反馈'
@@ -146,8 +146,8 @@
     <select id="selectWebFeedbackDetail" resultType="shop.alien.entity.store.vo.LifeFeedbackDetailVo">
         SELECT
             f.id,
-            u.user_name AS nickName,
-            u.user_phone AS phone,
+            u.nick_name AS nickName,
+            u.phone AS phone,
             f.staff_id AS staffId,
             CONCAT(IFNULL(s.user_name, '')) AS staffInfo,
             f.feedback_source AS feedbackSource,

+ 14 - 22
alien-store/src/main/java/shop/alien/store/service/impl/LifeFeedbackServiceImpl.java

@@ -20,10 +20,8 @@ import shop.alien.entity.store.vo.FeedbackReplyVo;
 import shop.alien.mapper.LifeFeedbackMapper;
 import shop.alien.mapper.LifeLogMapper;
 import shop.alien.mapper.LifeNoticeMapper;
-import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.StoreUserMapper;
 import shop.alien.entity.store.LifeNotice;
-import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.StoreUser;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.store.config.WebSocketProcess;
@@ -50,7 +48,6 @@ public class LifeFeedbackServiceImpl extends ServiceImpl<LifeFeedbackMapper, Lif
     private final LifeLogMapper lifeLogMapper;
     private final LifeFeedbackReplyService lifeFeedbackReplyService;
     private final LifeNoticeMapper lifeNoticeMapper;
-    private final LifeUserMapper lifeUserMapper;
     private final StoreUserMapper storeUserMapper;
     private final WebSocketProcess webSocketProcess;
 
@@ -640,30 +637,25 @@ public class LifeFeedbackServiceImpl extends ServiceImpl<LifeFeedbackMapper, Lif
                 log.warn("反馈来源为空,无法发送通知,feedbackId={}", feedback.getId());
                 return;
             }
+            
+            // userId对应store_user表的id,统一从store_user表查询
+            if (feedback.getUserId() == null) {
+                log.warn("用户ID为空,无法发送通知,feedbackId={}", feedback.getId());
+                return;
+            }
+
+            StoreUser storeUser = storeUserMapper.selectById(feedback.getUserId());
+            if (storeUser == null || storeUser.getPhone() == null || storeUser.getPhone().trim().isEmpty()) {
+                log.warn("未找到商户用户信息或手机号为空,无法发送通知,userId={}", feedback.getUserId());
+                return;
+            }
 
+            // 根据feedbackSource设置不同的接收者ID格式
             if (feedback.getFeedbackSource() == 0) {
                 // 用户端 - 使用user_手机号格式
-                if (feedback.getUserId() == null) {
-                    log.warn("用户ID为空,无法发送通知,feedbackId={}", feedback.getId());
-                    return;
-                }
-                LifeUser lifeUser = lifeUserMapper.selectById(feedback.getUserId());
-                if (lifeUser == null || lifeUser.getUserPhone() == null || lifeUser.getUserPhone().trim().isEmpty()) {
-                    log.warn("未找到用户信息或手机号为空,无法发送通知,userId={}", feedback.getUserId());
-                    return;
-                }
-                receiverId = "user_" + lifeUser.getUserPhone();
+                receiverId = "user_" + storeUser.getPhone();
             } else if (feedback.getFeedbackSource() == 1) {
                 // 商家端 - 使用store_手机号格式
-                if (feedback.getUserId() == null) {
-                    log.warn("商家用户ID为空,无法发送通知,feedbackId={}", feedback.getId());
-                    return;
-                }
-                StoreUser storeUser = storeUserMapper.selectById(feedback.getUserId());
-                if (storeUser == null || storeUser.getPhone() == null || storeUser.getPhone().trim().isEmpty()) {
-                    log.warn("未找到商家用户信息或手机号为空,无法发送通知,userId={}", feedback.getUserId());
-                    return;
-                }
                 receiverId = "store_" + storeUser.getPhone();
             } else {
                 log.warn("未知的反馈来源,feedbackSource={}, feedbackId={}", feedback.getFeedbackSource(), feedback.getId());