From 1e12b2abcaa1bdbdb57d3694446337126168bef1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 19:15:08 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/CommonQuestionController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/CommonQuestionController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/CommonQuestionController.java
index 2a1a0df..b6d5000 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/CommonQuestionController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/CommonQuestionController.java
@@ -10,6 +10,7 @@
import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
import com.xinquan.system.api.RemoteUserService;
+import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.CommissionRule;
import com.xinquan.system.api.model.LoginUser;
import com.xinquan.system.domain.CommonQuestion;
@@ -19,6 +20,7 @@
import com.xinquan.system.utils.ObsUploadUtil;
import com.xinquan.system.utils.QRCodeUtil;
import com.xinquan.system.utils.UUIDUtil;
+import com.xinquan.user.api.feign.RemoteAppUserService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -27,6 +29,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -60,6 +63,9 @@
private RemoteUserService remoteUserService;
@Autowired
private TokenService tokenService;
+ @Autowired
+ private RemoteAppUserService remoteAppUserService;
+
@PostMapping("/getQrCode")
@ApiOperation(value = "获取客服微信二维码",tags = "获取客服微信二维码")
public R getQrCode() {
@@ -201,17 +207,27 @@
Long userId = loginUser.getUserid();
String string = userId.toString();
CommissionRule one = commissionRuleService.lambdaQuery().one();
+ AppUser data = remoteAppUserService.getUserById(userId).getData();
+ if (data!=null){
+ if (StringUtils.hasLength(data.getQrCode())){
+ one.setQrCode(data.getQrCode());
+ remoteAppUserService.saveQrCode(data);
+ return R.ok(one);
+ }
+ }else{
+ return R.tokenError("登录失效");
+ }
HashMap<String, String> blueCode = new HashMap<>();
blueCode.put("user_id", string);
System.err.println("APP推广活动页"+string);
-
String blueS = "https://xq.xqzhihui.com/share/#/pages/register/register?userId="+string;
-
MyQrCodeUtil.createCodeToFile(blueS);
BufferedImage blueImage = QRCodeUtil.createImage(blueS);
MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
String s = ObsUploadUtil.obsUpload(blueFile);
one.setQrCode(s);
+ data.setQrCode(s);
+ remoteAppUserService.saveQrCode(data);
return R.ok(one);
}
@@ -231,6 +247,15 @@
System.err.println("推广人id"+userId);
CommissionRule one = commissionRuleService.lambdaQuery().one();
HashMap<String, String> blueCode = new HashMap<>();
+ AppUser data = remoteAppUserService.getUserById(Long.valueOf(userId)).getData();
+ if (data!=null){
+ if (StringUtils.hasLength(data.getQrCode())){
+ one.setQrCode(data.getQrCode());
+ return R.ok(one);
+ }
+ }else{
+ return R.tokenError("登录失效");
+ }
blueCode.put("user_id", userId + "");
String blueS = "https://xq.xqzhihui.com/share/#/pages/register/register?userId="+userId;
MyQrCodeUtil.createCodeToFile(blueS);
--
Gitblit v1.7.1