From f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:50:33 +0800
Subject: [PATCH] 完善功能
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
index 4c80295..289bd9d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
@@ -2,11 +2,13 @@
import java.time.LocalDateTime;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TIntegralRule;
+import com.ruoyi.other.api.dto.SaveHtml;
import com.ruoyi.other.service.THtmlService;
import com.ruoyi.other.service.TIntegralRuleService;
import io.swagger.annotations.ApiImplicitParam;
@@ -34,18 +36,22 @@
@GetMapping("/getSet")
- @ApiOperation(tags = {"管理后台-积分管理"},value = "获取积分设置")
+ @ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置")
public R<TIntegralRule> getSet() {
TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
return R.ok(res);
}
-
-
@PostMapping("/saveSet")
@ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
public R saveSet(@RequestBody TIntegralRule dto) {
- integralRuleService.updateById(dto);
+ TIntegralRule one = integralRuleService.getOne(null);
+ if (one!=null){
+ dto.setId(one.getId());
+ integralRuleService.saveOrUpdate(dto);
+ }else{
+ integralRuleService.saveOrUpdate(dto);
+ }
return R.ok();
}
@GetMapping("/getInfo")
@@ -62,38 +68,25 @@
"11=开票说明")
public R<String> getInfo(Integer type) {
THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+ if (g == null){
+ return R.ok("");
+ }
return R.ok(g.getContent());
}
- @GetMapping("/saveInfo")
- @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "info", value = "内容", required = true),
- @ApiImplicitParam(name = "type", value = "type 1=积分规则说明，\" +\n" +
- " \"2=会员折扣说明，\" +\n" +
- " \"3=优惠券说明，\" +\n" +
- " \"4=双倍积分说明，\" +\n" +
- " \"5=商城专享价说明，\" +\n" +
- " \"6=会员协议，\" +\n" +
- " \"7=用户协议，\" +\n" +
- " \"8=隐私协议，\" +\n" +
- " \"9=邀请好友说明，\" +\n" +
- " \"10=资质证明，\" +\n" +
- " \"11=开票说明\"", required = true),
- })
- public R saveInfo(String info,Integer type) {
- THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+
+
+ @PostMapping("/saveInfo")
+ @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明")
+ public R saveInfo(@RequestBody SaveHtml dto) {
+ THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",dto.getType()));
if (g == null){
THtml tHtml = new THtml();
- tHtml.setType(type);
- tHtml.setContent(info);
-
-
- tHtml.setCreateTime(LocalDateTime.now());
- tHtml.setDelFlag(false);
+ tHtml.setType(dto.getType());
+ tHtml.setContent(dto.getInfo());
htmlService.save(tHtml);
}else{
- g.setContent(info);
+ g.setContent(dto.getInfo());
htmlService.updateById(g);
}
return R.ok();
--
Gitblit v1.7.1