liujie
2026-03-02 e3268ed62b52a90d20ac2e10ffbf7fab6c00f9fd
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
3个文件已修改
13 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/QuestionnaireController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
    }
}
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();
                if(StringUtils.hasLength(answerValue)){
                answerValue = answerValue+","+userId;
                }else{
                    answerValue = userId;
                }
                questionnaireStemOption.setAnswerValue(answerValue);
            }
            questionnaireStemOptionService.updateBatchById(questionnaireStemOptions);
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