From 80835bcc12f4788c1a88da61e623b362e57f1cb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 24 八月 2024 09:31:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 62 ++++++++++++++++++++++++++----
1 files changed, 53 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 772d11a..d8c9658 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,14 +1,13 @@
package com.ruoyi.other.controller;
import java.time.LocalDateTime;
-import java.util.Date;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.annotation.JsonFormat;
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.SaveIntegralDTO;
import com.ruoyi.other.service.THtmlService;
import com.ruoyi.other.service.TIntegralRuleService;
import io.swagger.annotations.ApiImplicitParam;
@@ -32,16 +31,51 @@
private THtmlService htmlService;
@Autowired
private TIntegralRuleService integralRuleService;
+
+
+
@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);
+// JSONObject jsonObject = JSONObject.parseObject(dto);
+// String chargeCredit = jsonObject.getString("chargeCredit");
+// String credit = jsonObject.getString("credit");
+// String inviteUsersToEarnPoints = jsonObject.getString("inviteUsersToEarnPoints");
+// String addVehiclesEarnsPoints = jsonObject.getString("addVehiclesEarnsPoints");
+// String signInForPoints = jsonObject.getString("signInForPoints");
+// TIntegralRule tIntegralRule = new TIntegralRule();
+// tIntegralRule.setAddVehiclesEarnsPoints(signInForPoints);
+// tIntegralRule.setChargeCredit(chargeCredit);
+// tIntegralRule.setCredit(credit);
+// tIntegralRule.setSignInForPoints(addVehiclesEarnsPoints);
+// tIntegralRule.setInviteUsersToEarnPoints(inviteUsersToEarnPoints);
+// TIntegralRule one = integralRuleService.getOne(null);
+// if (one!=null){
+// one.setAddVehiclesEarnsPoints(signInForPoints);
+// one.setChargeCredit(chargeCredit);
+// one.setCredit(credit);
+// one.setSignInForPoints(addVehiclesEarnsPoints);
+// one.setInviteUsersToEarnPoints(inviteUsersToEarnPoints);
+// integralRuleService.updateById(one);
+// }else{
+// integralRuleService.save(tIntegralRule);
+// }
+ TIntegralRule one = integralRuleService.getOne(null);
+ if (one!=null){
+ dto.setId(one.getId());
+ integralRuleService.saveOrUpdate(dto);
+ }else{
+ integralRuleService.saveOrUpdate(dto);
+ }
return R.ok();
}
@GetMapping("/getInfo")
@@ -58,8 +92,14 @@
"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({
@@ -83,10 +123,6 @@
THtml tHtml = new THtml();
tHtml.setType(type);
tHtml.setContent(info);
-
-
- tHtml.setCreateTime(LocalDateTime.now());
- tHtml.setDelFlag(false);
htmlService.save(tHtml);
}else{
g.setContent(info);
@@ -94,5 +130,13 @@
}
return R.ok();
}
+
+
+ @GetMapping("/getIntegralRule")
+ @ApiOperation(tags = {"小程序-充电记录"},value = "获取积分规则设置")
+ public AjaxResult<String> getIntegralRule(){
+ TIntegralRule one = integralRuleService.getOne(null);
+ return AjaxResult.success(one);
+ }
}
--
Gitblit v1.7.1