mirror of
https://gitee.com/y_project/RuoYi-Cloud.git
synced 2026-01-26 11:51:55 +08:00
球衣二维码逻辑修改
This commit is contained in:
@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import com.ruoyi.common.core.annotation.Excel;
|
||||||
@@ -78,6 +79,11 @@ public class UserWxAqrCode extends BaseEntity
|
|||||||
@Excel(name = "球队ID")
|
@Excel(name = "球队ID")
|
||||||
private Long teamId;
|
private Long teamId;
|
||||||
|
|
||||||
|
@Excel(name = "赛会参赛人员ID")
|
||||||
|
private Long competitionMembersId;
|
||||||
|
@Excel(name = "赛会参赛球队ID")
|
||||||
|
private Long competitionOfTeamId;
|
||||||
|
|
||||||
public void setId(Long id)
|
public void setId(Long id)
|
||||||
{
|
{
|
||||||
this.id = id;
|
this.id = id;
|
||||||
@@ -214,24 +220,19 @@ public class UserWxAqrCode extends BaseEntity
|
|||||||
return teamId;
|
return teamId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public Long getCompetitionMembersId() {
|
||||||
public String toString() {
|
return competitionMembersId;
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
}
|
||||||
.append("id", getId())
|
|
||||||
.append("isDeleted", getIsDeleted())
|
public void setCompetitionMembersId(Long competitionMembersId) {
|
||||||
.append("createdTime", getCreatedTime())
|
this.competitionMembersId = competitionMembersId;
|
||||||
.append("createdBy", getCreatedBy())
|
}
|
||||||
.append("modifiedBy", getModifiedBy())
|
|
||||||
.append("lastUpdatedTime", getLastUpdatedTime())
|
public Long getCompetitionOfTeamId() {
|
||||||
.append("scene", getScene())
|
return competitionOfTeamId;
|
||||||
.append("codeImgUrl", getCodeImgUrl())
|
}
|
||||||
.append("userId", getUserId())
|
|
||||||
.append("busType", getBusType())
|
public void setCompetitionOfTeamId(Long competitionOfTeamId) {
|
||||||
.append("page", getPage())
|
this.competitionOfTeamId = competitionOfTeamId;
|
||||||
.append("width", getWidth())
|
|
||||||
.append("useDesc", getUseDesc())
|
|
||||||
.append("jerseyNo", getJerseyNo())
|
|
||||||
.append("teamId", getTeamId())
|
|
||||||
.toString();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ import com.ruoyi.common.security.utils.SecurityUtils;
|
|||||||
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
|
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
|
||||||
import com.ruoyi.system.api.feign.WxAppletsFeign;
|
import com.ruoyi.system.api.feign.WxAppletsFeign;
|
||||||
import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
|
import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
|
||||||
import org.apache.commons.lang.ObjectUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.ruoyi.system.mapper.UserWxAqrCodeMapper;
|
import com.ruoyi.system.mapper.UserWxAqrCodeMapper;
|
||||||
import com.ruoyi.system.domain.UserWxAqrCode;
|
import com.ruoyi.system.domain.UserWxAqrCode;
|
||||||
import com.ruoyi.system.service.IUserWxAqrCodeService;
|
import com.ruoyi.system.service.IUserWxAqrCodeService;
|
||||||
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
@@ -116,10 +116,19 @@ public class UserWxAqrCodeServiceImpl implements IUserWxAqrCodeService
|
|||||||
StringBuffer sceneBuffer = new StringBuffer();
|
StringBuffer sceneBuffer = new StringBuffer();
|
||||||
sceneBuffer.append("id=");
|
sceneBuffer.append("id=");
|
||||||
sceneBuffer.append(userWxAqrCode.getId());
|
sceneBuffer.append(userWxAqrCode.getId());
|
||||||
sceneBuffer.append("&tid=");
|
sceneBuffer.append("ty=");
|
||||||
sceneBuffer.append(userWxAqrCode.getTeamId());
|
sceneBuffer.append(userWxAqrCode.getBusType());
|
||||||
sceneBuffer.append("&uid=");
|
if(!ObjectUtils.isEmpty(userWxAqrCode.getBusType())&&userWxAqrCode.getBusType().equals("sh")) {
|
||||||
sceneBuffer.append(userWxAqrCode.getUserId());
|
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());
|
wxAppletsCodeVo.setScene(sceneBuffer.toString());
|
||||||
}else {
|
}else {
|
||||||
wxAppletsCodeVo.setScene(userWxAqrCode.getScene());
|
wxAppletsCodeVo.setScene(userWxAqrCode.getScene());
|
||||||
|
|||||||
Reference in New Issue
Block a user