From 4d7a208f388e42e7dd83dab0e38eadfa0847de1c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:24:10 +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 | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 28 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 5027933..08fd0dc 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,13 +2,27 @@
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.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
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.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TIntegralRule;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.dto.SaveHtml;
import com.ruoyi.other.service.THtmlService;
import com.ruoyi.other.service.TIntegralRuleService;
+import com.ruoyi.other.service.TVipService;
+import com.ruoyi.system.api.model.LoginUserApplet;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -30,24 +44,78 @@
private THtmlService htmlService;
@Autowired
private TIntegralRuleService integralRuleService;
+ @Autowired
+ private AppUserClient appUserClient;
+
+
+ /**
+ * 远程调用 获取首次添加车辆可获得积分
+ * @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);
+ }
+ @Autowired
+ private TokenService tokenService;
+ @Autowired
+ private TVipService vipService;
-
+ @RequiresPermissions(value = {"/IntegralSetting"}, logical = Logical.OR)
@GetMapping("/getSet")
- @ApiOperation(tags = {"管理后台-积分管理"},value = "获取积分设置")
+ @ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置")
public R<TIntegralRule> getSet() {
TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
return R.ok(res);
}
+ @GetMapping("/getSet1")
+ @ApiOperation(tags = {"小程序-个人中心-签到"},value = "获取积分设置")
+ public R<TIntegralRule> getSet1() {
+ TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
+ LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
+ res.setIsDouble(0);
+ if (loginUserApplet!=null){
+ TAppUser data = appUserClient.getUserById(loginUserApplet.getUserId()).getData();
+ if (data.getVipEndTime()!=null && data.getVipEndTime().isAfter(LocalDateTime.now())){
+ TVip byId = vipService.getById(data.getVipId());
+ Integer doubleIntegration = byId.getDoubleIntegration();
+ if (doubleIntegration!=null&&doubleIntegration==1){
+ res.setIsDouble(1);
+ }
+ }
+ }
+ return R.ok(res);
+ }
-
+ @RequiresPermissions(value = {"/IntegralSetting"}, logical = Logical.OR)
@PostMapping("/saveSet")
@ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
+ @Log(title = "【积分管理】保存积分设置", businessType = BusinessType.INSERT)
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();
}
+
+
+
+ @RequiresPermissions(value = {"/vipSetting/html"}, logical = Logical.OR)
@GetMapping("/getInfo")
@ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明，" +
"2=会员折扣说明，" +
@@ -67,35 +135,22 @@
}
return R.ok(g.getContent());
}
-
-
-
- @GetMapping("/saveInfo")
+
+
+
+ @RequiresPermissions(value = {"/vipSetting/html"}, logical = Logical.OR)
+ @PostMapping("/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));
+ @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){
THtml tHtml = new THtml();
- tHtml.setType(type);
- tHtml.setContent(info);
+ 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