From cb05290d092f3a6c4f750ba34d13b79d3530e1c6 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Wed, 14 Jun 2023 17:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=90=83=E8=A1=A3=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/domain/UserWxAqrCode.java    | 39 ++++++++++---------
 .../impl/UserWxAqrCodeServiceImpl.java        | 19 ++++++---
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
index 9a522f7a..ff10c7b9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -78,6 +79,11 @@ public class UserWxAqrCode extends BaseEntity
     @Excel(name = "球队ID")
     private Long teamId;
 
+    @Excel(name = "赛会参赛人员ID")
+    private Long competitionMembersId;
+    @Excel(name = "赛会参赛球队ID")
+    private Long competitionOfTeamId;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -214,24 +220,19 @@ public class UserWxAqrCode extends BaseEntity
         return teamId;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("isDeleted", getIsDeleted())
-                .append("createdTime", getCreatedTime())
-                .append("createdBy", getCreatedBy())
-                .append("modifiedBy", getModifiedBy())
-                .append("lastUpdatedTime", getLastUpdatedTime())
-                .append("scene", getScene())
-                .append("codeImgUrl", getCodeImgUrl())
-                .append("userId", getUserId())
-                .append("busType", getBusType())
-                .append("page", getPage())
-                .append("width", getWidth())
-                .append("useDesc", getUseDesc())
-                .append("jerseyNo", getJerseyNo())
-                .append("teamId", getTeamId())
-                .toString();
+    public Long getCompetitionMembersId() {
+        return competitionMembersId;
+    }
+
+    public void setCompetitionMembersId(Long competitionMembersId) {
+        this.competitionMembersId = competitionMembersId;
+    }
+
+    public Long getCompetitionOfTeamId() {
+        return competitionOfTeamId;
+    }
+
+    public void setCompetitionOfTeamId(Long competitionOfTeamId) {
+        this.competitionOfTeamId = competitionOfTeamId;
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java
index f50500f1..eee7845a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java
@@ -9,12 +9,12 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
 import com.ruoyi.system.api.feign.WxAppletsFeign;
 import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
-import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.UserWxAqrCodeMapper;
 import com.ruoyi.system.domain.UserWxAqrCode;
 import com.ruoyi.system.service.IUserWxAqrCodeService;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 
@@ -116,10 +116,19 @@ public class UserWxAqrCodeServiceImpl implements IUserWxAqrCodeService
             StringBuffer sceneBuffer = new StringBuffer();
             sceneBuffer.append("id=");
             sceneBuffer.append(userWxAqrCode.getId());
-            sceneBuffer.append("&tid=");
-            sceneBuffer.append(userWxAqrCode.getTeamId());
-            sceneBuffer.append("&uid=");
-            sceneBuffer.append(userWxAqrCode.getUserId());
+            sceneBuffer.append("ty=");
+            sceneBuffer.append(userWxAqrCode.getBusType());
+            if(!ObjectUtils.isEmpty(userWxAqrCode.getBusType())&&userWxAqrCode.getBusType().equals("sh")) {
+                sceneBuffer.append("&tid=");
+                sceneBuffer.append(userWxAqrCode.getCompetitionOfTeamId());
+                sceneBuffer.append("&uid=");
+                sceneBuffer.append(userWxAqrCode.getCompetitionMembersId());
+            }else {
+                sceneBuffer.append("&tid=");
+                sceneBuffer.append(userWxAqrCode.getTeamId());
+                sceneBuffer.append("&uid=");
+                sceneBuffer.append(userWxAqrCode.getUserId());
+            }
             wxAppletsCodeVo.setScene(sceneBuffer.toString());
         }else {
             wxAppletsCodeVo.setScene(userWxAqrCode.getScene());