Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-10-28 d6c8f09fd628bd0111de4ee7071844465df9adb1

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java

@@ -2,11 +2,16 @@
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;
import com.ruoyi.other.service.THtmlService;
import com.ruoyi.other.service.TIntegralRuleService;
import io.swagger.annotations.ApiImplicitParam;
@@ -30,24 +35,47 @@
    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 = "获取积分设置")
    @ApiOperation(tags = {"管理后台-积分管理","小程序-个人中心-签到"},value = "获取积分设置")
    public R<TIntegralRule> getSet() {
        TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
        return R.ok(res);
    }
    
    
    
    @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();
    }


    @GetMapping("/getInfo")
    @ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明，" +
            "2=会员折扣说明，" +
@@ -67,32 +95,21 @@
        }
        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 = "保存积分说明")
    @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();