From e3268ed62b52a90d20ac2e10ffbf7fab6c00f9fd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 02 三月 2026 09:50:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 6 ++++++
ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/QuestionnaireController.java | 7 ++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 1d1bcf3..ff43475 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -48,5 +48,11 @@
public R<TAppUser> detail(@RequestParam String id) {
return R.ok(appUserService.getById( id));
}
+ @ApiOperation(value = "修改用户信息")
+ @PostMapping(value = "/updateById")
+ public R<String> updateById(@RequestParam TAppUser appUser) {
+ appUserService.updateById(appUser);
+ return R.ok();
+ }
}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/QuestionnaireController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/QuestionnaireController.java
index c9aa699..0ba40e0 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/QuestionnaireController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/QuestionnaireController.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -93,7 +94,11 @@
List<TQuestionnaireStemOption> questionnaireStemOptions = questionnaireStemOptionService.listByIds(tQuestionnaireStemOptionIds);
for (TQuestionnaireStemOption questionnaireStemOption : questionnaireStemOptions) {
String answerValue = questionnaireStemOption.getAnswerValue();
- answerValue = answerValue+","+userId;
+ if(StringUtils.hasLength(answerValue)){
+ answerValue = answerValue+","+userId;
+ }else{
+ answerValue = userId;
+ }
questionnaireStemOption.setAnswerValue(answerValue);
}
questionnaireStemOptionService.updateBatchById(questionnaireStemOptions);
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml
index 1ea21d2..df22b6f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml
@@ -95,7 +95,7 @@
<if test="query.payStatus != null">
AND tco.pay_status = #{query.payStatus}
</if>
- AND tco.bank_card_number IS NOT NULL
+ AND tco.refund_status IS NOT NULL
AND tco.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tco.create_time DESC
--
Gitblit v1.7.1