From 2749626492862339a50789933bb110f691426225 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 07 八月 2024 16:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 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 5fe7e70..712ef14 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
@@ -1,10 +1,20 @@
package com.ruoyi.other.controller;
+import java.time.LocalDateTime;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.THtml;
+import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.dto.SaveIntegralDTO;
+import com.ruoyi.other.service.THtmlService;
+import com.ruoyi.other.service.TIntegralRuleService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
@@ -18,24 +28,70 @@
@RestController
@RequestMapping("/integral")
public class TIntegralRuleController {
+ @Autowired
+ private THtmlService htmlService;
+ @Autowired
+ private TIntegralRuleService integralRuleService;
@GetMapping("/getSet")
@ApiOperation(value = "获取积分设置")
- public R<SaveIntegralDTO> getSet() {
- return R.ok();
+ public R<TIntegralRule> getSet() {
+ TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
+ return R.ok(res);
}
@PostMapping("/saveSet")
@ApiOperation(value = "保存积分设置")
- public R saveSet(@RequestBody SaveIntegralDTO dto) {
+ public R saveSet(@RequestBody TIntegralRule dto) {
+ integralRuleService.updateById(dto);
return R.ok();
}
- @PostMapping("/getInfo")
- @ApiOperation(value = "获取积分说明")
- public R getInfo() {
- return R.ok();
+ @GetMapping("/getInfo")
+ @ApiOperation(value = "type 1=积分规则说明，" +
+ "2=会员折扣说明，" +
+ "3=优惠券说明，" +
+ "4=双倍积分说明，" +
+ "5=商城专享价说明，" +
+ "6=会员协议，" +
+ "7=用户协议，" +
+ "8=隐私协议，" +
+ "9=邀请好友说明，" +
+ "10=资质证明，" +
+ "11=开票说明")
+ public R<String> getInfo(Integer type) {
+ THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+ return R.ok(g.getContent());
}
- @PostMapping("/saveInfo")
+ @GetMapping("/saveInfo")
@ApiOperation(value = "保存积分说明")
- public R saveInfo() {
+ @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));
+ if (g == null){
+ THtml tHtml = new THtml();
+ tHtml.setType(type);
+ tHtml.setContent(info);
+
+
+ tHtml.setCreateTime(LocalDateTime.now());
+ tHtml.setDelFlag(false);
+ htmlService.save(tHtml);
+ }else{
+ g.setContent(info);
+ htmlService.updateById(g);
+ }
return R.ok();
}
}
--
Gitblit v1.7.1