From 9c4b38c6382b2a33d1716c962553ece34e4913f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 10:03:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 289bd9d..1813a92 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,10 +2,13 @@
import java.time.LocalDateTime;
+import com.alibaba.fastjson.JSON;
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.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.dto.SaveHtml;
@@ -32,9 +35,25 @@
private THtmlService htmlService;
@Autowired
private TIntegralRuleService integralRuleService;
-
-
-
+
+
+ /**
+ * 远程调用 获取首次添加车辆可获得积分
+ * @return
+ */
+ @PostMapping("/getAddCarIntegral")
+ public R<Integer> getAddCarIntegral() {
+ TIntegralRule one = integralRuleService.getOne(null);
+ String addVehiclesEarnsPoints = one.getAddVehiclesEarnsPoints();
+ JSONObject jsonObject = JSON.parseObject(addVehiclesEarnsPoints);
+ Integer point = 0;
+ //增加车牌50分，必填
+ point += jsonObject.getInteger("num1");
+ point += jsonObject.getInteger("num2");
+ point += jsonObject.getInteger("num3");
+ point += jsonObject.getInteger("num4");
+ return R.ok(point);
+ }
@GetMapping("/getSet")
@ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置")
public R<TIntegralRule> getSet() {
@@ -44,6 +63,7 @@
@PostMapping("/saveSet")
@ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
+ @Log(title = "【积分管理】保存积分设置", businessType = BusinessType.INSERT)
public R saveSet(@RequestBody TIntegralRule dto) {
TIntegralRule one = integralRuleService.getOne(null);
if (one!=null){
@@ -54,6 +74,8 @@
}
return R.ok();
}
+
+
@GetMapping("/getInfo")
@ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明，" +
"2=会员折扣说明，" +
@@ -78,6 +100,7 @@
@PostMapping("/saveInfo")
@ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明")
+ @Log(title = "【积分管理】保存积分说明", businessType = BusinessType.INSERT)
public R saveInfo(@RequestBody SaveHtml dto) {
THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",dto.getType()));
if (g == null){
--
Gitblit v1.7.1