From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/CommonQuestionController.java | 161 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 137 insertions(+), 24 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 9e55c88..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
@@ -4,11 +4,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.common.core.web.domain.AjaxResult;
+import com.xinquan.common.log.annotation.Log;
+import com.xinquan.common.log.enums.BusinessType;
+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.vo.InviteRankListVO;
-import com.xinquan.system.domain.CommissionRule;
+import com.xinquan.system.api.domain.CommissionRule;
+import com.xinquan.system.api.model.LoginUser;
import com.xinquan.system.domain.CommonQuestion;
import com.xinquan.system.service.CommissionRuleService;
import com.xinquan.system.service.CommonQuestionService;
@@ -16,13 +20,16 @@
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;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
-import org.omg.CORBA.PRIVATE_MEMBER;
+import org.aspectj.weaver.loadtime.Aj;
+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;
@@ -31,11 +38,9 @@
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.stream.Collectors;
/**
@@ -48,6 +53,7 @@
*/
@RestController
@RequestMapping("/system/common-question")
+
public class CommonQuestionController {
@Resource
private CommonQuestionService commonQuestionService;
@@ -55,15 +61,23 @@
private CommissionRuleService commissionRuleService;
@Resource
private RemoteUserService remoteUserService;
+ @Autowired
+ private TokenService tokenService;
+ @Autowired
+ private RemoteAppUserService remoteAppUserService;
+
@PostMapping("/getQrCode")
@ApiOperation(value = "获取客服微信二维码",tags = "获取客服微信二维码")
public R getQrCode() {
- Long userId = SecurityUtils.getUserId();
- if (userId==0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
CommonQuestion one = commonQuestionService.lambdaQuery().eq(CommonQuestion::getType, 2).one();
return R.ok(one.getCustomerServiceQrCode());
}
- @PostMapping("/commonQuestion")
+ @GetMapping("/commonQuestion")
@ApiOperation(value = "常见问题列表", tags = {"联系客服"})
@ApiImplicitParams({
@ApiImplicitParam(value = "分页参数，当前页码", name = "pageCurr", required = true, dataType = "Integer"),
@@ -72,17 +86,22 @@
public R<PageDTO<CommonQuestion>> myInviteRankList(
@RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
- Long userId = SecurityUtils.getUserId();
- if (userId == 0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
Page<CommonQuestion> page = commonQuestionService.lambdaQuery()
+ .eq(CommonQuestion::getType,1)
.orderByDesc(CommonQuestion::getSortNum)
+ .orderByDesc(CommonQuestion::getCreateTime)
.page(new Page<>(pageCurr, pageSize));
if (page.getRecords().isEmpty()){
return R.ok(PageDTO.empty(page));
}
return R.ok(PageDTO.of(page, CommonQuestion.class));
}
- @PostMapping("/commonQuestionList")
+ @GetMapping("/commonQuestionList")
@ApiOperation(value = "常见问题列表-分页", tags = {"管理后台-常见问题"})
@ApiImplicitParams({
@ApiImplicitParam(value = "分页参数，当前页码", name = "pageCurr", required = true, dataType = "Integer"),
@@ -91,11 +110,14 @@
public R<PageDTO<CommonQuestion>> commonQuestionList(
@RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
- Long userId = SecurityUtils.getUserId();
- if (userId == 0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
Page<CommonQuestion> page = commonQuestionService.lambdaQuery()
.eq(CommonQuestion::getType,1)
- .orderByDesc(CommonQuestion::getSortNum)
+ .orderByDesc(CommonQuestion::getCreateTime)
.page(new Page<>(pageCurr, pageSize));
if (page.getRecords().isEmpty()){
return R.ok(PageDTO.empty(page));
@@ -105,25 +127,61 @@
}
return R.ok(PageDTO.of(page, CommonQuestion.class));
}
+ @GetMapping("/detailKfCode")
+ @ApiOperation(value = "查看详情客服微信", tags = "管理后台-常见问题")
+ public R<CommonQuestion> detailKfCode() {
+ CommonQuestion one = commonQuestionService.lambdaQuery()
+ .eq(CommonQuestion::getType, 2).one();
+ if (one == null){
+ return R.ok(new CommonQuestion());
+ }
+ one.setUid(one.getId()+"");
+ return R.ok(one);
+ }
+ @GetMapping("/updateKfCode")
+ @ApiOperation(value = "修改/新增客服微信", tags = "管理后台-常见问题")
+ @Log(title = "【常见问题】修改客服微信", businessType = BusinessType.UPDATE)
+ public R<CommonQuestion> updateKfCode(String customerServiceQrCode) {
+ CommonQuestion one = commonQuestionService.lambdaQuery()
+ .eq(CommonQuestion::getType, 2).one();
+ if (one == null){
+ // 新增
+ CommonQuestion commonQuestion = new CommonQuestion();
+ commonQuestion.setCustomerServiceQrCode(customerServiceQrCode);
+ commonQuestion.setType(2);
+ commonQuestionService.save(commonQuestion);
+ }else{
+ // 编辑
+ one.setCustomerServiceQrCode(customerServiceQrCode);
+ commonQuestionService.updateById(one);
+ }
+ return R.ok();
+ }
@PostMapping("/addCommonQuestion")
- @ApiOperation(value = "新增常见问题", notes = "管理后台-常见问题")
+ @ApiOperation(value = "新增常见问题", tags = "管理后台-常见问题")
+ @Log(title = "【常见问题】新增常见问题", businessType = BusinessType.INSERT)
+
public R addCommonQuestion(@RequestBody CommonQuestion homeBackgroundMusic) {
return R.ok(commonQuestionService.save(homeBackgroundMusic));
}
+
@GetMapping("/detailCommonQuestion")
- @ApiOperation(value = "查看详情常见问题", notes = "管理后台-常见问题")
+ @ApiOperation(value = "查看详情常见问题", tags = "管理后台-常见问题")
public R<CommonQuestion> detailCommonQuestion(String uid) {
return R.ok(commonQuestionService.getById(uid));
}
@PostMapping("/updateCommonQuestion")
- @ApiOperation(value = "修改常见问题", notes = "管理后台-常见问题")
+ @ApiOperation(value = "修改常见问题", tags = "管理后台-常见问题")
+ @Log(title = "【常见问题】修改常见问题", businessType = BusinessType.UPDATE)
+
public R updateCommonQuestion(@RequestBody CommonQuestion homeBackgroundMusic) {
return R.ok(commonQuestionService.updateById(homeBackgroundMusic));
}
@PostMapping("/deleteCommonQuestion")
- @ApiOperation(value = "批量删除", notes = "管理后台-常见问题")
+ @ApiOperation(value = "批量删除", tags = "管理后台-常见问题")
+ @Log(title = "【常见问题】批量删除常见问题", businessType = BusinessType.DELETE)
public R deleteCommonQuestion(String ids) {
- return R.ok(commonQuestionService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.ok(commonQuestionService.removeBatchByIds(Arrays.asList(ids.split(",")).stream().map(Long::valueOf).collect(Collectors.toList())));
}
@PostMapping("/getQuestionById")
@ApiOperation(value = "常见问题列表-查看详情", tags = {"联系客服"})
@@ -131,20 +189,75 @@
@ApiImplicitParam(value = "id", name = "id", required = true, dataType = "Integer"),
})
public R<CommonQuestion> myInviteRankList(Long id) {
- Long userId = SecurityUtils.getUserId();
- if (userId == 0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
CommonQuestion byId = commonQuestionService.getById(id);
return R.ok(byId);
}
@PostMapping("/getCommissionRule")
@ApiOperation(value = "推广活动页",tags = "推广活动页")
public R<CommissionRule> getCommissionRule() throws Exception {
- Long userId = SecurityUtils.getUserId();
- if (userId==0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ 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);
+ }
+
+ public static void main(String[] args) throws Exception {
+ HashMap<String, String> blueCode = new HashMap<>();
+ blueCode.put("url", "https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/apkAndroid.apk");
+ String blueS = "https://xqgwzh.obs.cn-south-1.myhuaweicloud.com/apkAndroid.apk";
+ MyQrCodeUtil.createCodeToFile(blueS);
+ BufferedImage blueImage = QRCodeUtil.createImage(blueS);
+ MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
+ String s = ObsUploadUtil.obsUpload(blueFile);
+ System.err.println(s);
+ }
+ @PostMapping("/getCommissionRuleShare")
+ @ApiOperation(value = "推广活动页",tags = "H5分享")
+ public R<CommissionRule> getCommissionRuleShare(String userId) throws Exception {
+ 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 = "{\"user_id\": " + userId + "}";
+ String blueS = "https://xq.xqzhihui.com/share/#/pages/register/register?userId="+userId;
MyQrCodeUtil.createCodeToFile(blueS);
BufferedImage blueImage = QRCodeUtil.createImage(blueS);
MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
--
Gitblit v1.7.1