From fa2d521be4eb5c439cfacee75b4466c4e55a76cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Tue, 23 Apr 2024 15:37:34 +0800
Subject: [PATCH] init

---
 .../service/impl/WxTransDataServiceImpl.java  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransDataServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransDataServiceImpl.java
index cb9083d..dd9eb19 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransDataServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/WxTransDataServiceImpl.java
@@ -125,24 +125,6 @@ public class WxTransDataServiceImpl extends ServiceImpl<WxTransDataMapper,WxTran
             vo.setCreateTime(record.getCreateTime());
             vo.setStatus(record.getStatus());
             if(record.getSponsorUserId().equals(userId)){
-                vo.setUserId(record.getSponsorUserId());
-                vo.setUsercode(record.getSponsorUsercode());
-                User user = userMap.get(record.getSponsorUserId());
-                if(user != null){
-                    vo.setAvatar(user.getAvatar());
-                    vo.setGender(user.getGender());
-                    vo.setNickname(user.getNickname());
-                    vo.setBirthday(user.getBirthday());
-                    vo.setBirthdayStr(BirthdayUtil.getMinBirthday(user.getBirthday()));
-                    vo.setAge(BirthdayUtil.getAge(user.getBirthday()));
-                    vo.setResidenceCityName(user.getResidenceCityName());
-                    vo.setEducation(user.getEducation());
-                    vo.setProfession(user.getProfession());
-                }
-                if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
-                    vo.setWxCode(record.getReceiveWx());
-                }
-            } else {
                 vo.setUserId(record.getReceiveUserId());
                 vo.setUsercode(record.getReceiveUsercode());
                 User user = userMap.get(record.getReceiveUserId());
@@ -160,6 +142,24 @@ public class WxTransDataServiceImpl extends ServiceImpl<WxTransDataMapper,WxTran
                 if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
                     vo.setWxCode(record.getSponsorWx());
                 }
+            } else {
+                vo.setUserId(record.getSponsorUserId());
+                vo.setUsercode(record.getSponsorUsercode());
+                User user = userMap.get(record.getSponsorUserId());
+                if(user != null){
+                    vo.setAvatar(user.getAvatar());
+                    vo.setGender(user.getGender());
+                    vo.setNickname(user.getNickname());
+                    vo.setBirthday(user.getBirthday());
+                    vo.setBirthdayStr(BirthdayUtil.getMinBirthday(user.getBirthday()));
+                    vo.setAge(BirthdayUtil.getAge(user.getBirthday()));
+                    vo.setResidenceCityName(user.getResidenceCityName());
+                    vo.setEducation(user.getEducation());
+                    vo.setProfession(user.getProfession());
+                }
+                if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
+                    vo.setWxCode(record.getReceiveWx());
+                }
             }
             res.add(vo);
         }