bug修改

无关风月

2025-08-25 48d3f1b77adea0609bb2453c7b4a660f2222871f

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

@@ -122,13 +122,25 @@
        ServicePay one = servicePayService.lambdaQuery().eq(ServicePay::getPayStatus, 2)
                .eq(ServicePay::getUserId, userid).orderByDesc(ServicePay::getCreateTime)
                .last("limit 1").one();
        if (one!=null){
        ServicePay servicePayBefore = servicePayService.lambdaQuery()
                .eq(ServicePay::getUserId, userid)
                .eq(ServicePay::getPayStatus,2)
                .eq(ServicePay::getDelFlag,0)
                .orderByDesc(ServicePay::getCreateTime)
                .last("limit 1")
                .one();
        if (servicePayBefore==null){
            workPlatformVO.setServiceStatus(1);
            workPlatformVO.setEndTime(one.getEndTime());
        } else if (servicePayBefore.getEndTime().isBefore(LocalDateTime.now())) {
            workPlatformVO.setServiceStatus(2);
            workPlatformVO.setEndTime(servicePayBefore.getEndTime());

        }else{
            workPlatformVO.setServiceStatus(0);
            workPlatformVO.setEndTime(null);
            workPlatformVO.setServiceStatus(3);
            workPlatformVO.setEndTime(servicePayBefore.getEndTime());

        }



        return R.ok(workPlatformVO);
@@ -146,7 +158,12 @@
        integralVO.setIntegral(integral);
        return R.ok(integralVO);
    }

    @ApiOperation(tags = {"2.0-积分钱包"}, value = "获取积分充值比例")
    @PostMapping(value = "/getPointPercent")
    public R getPointPercent() {
        SysConfig data1 = sysConfigClient.getInfo(8L).getData();
        return R.ok(data1.getConfigValue());
    }
    @ApiOperation(tags = {"2.0-积分钱包"}, value = "查询支付结果 true成功 false失败")
    @PostMapping(value = "/queryPayStatus")
    public R buy(@RequestParam Integer id) {
@@ -282,15 +299,19 @@
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
        ServicePay servicePay = new ServicePay();
        servicePay.setUserId(data.getUserId());
        servicePay.setAmount(site.getAnnualServiceFee());
        servicePay.setCode(code);
        servicePay.setPayStatus(1);
        servicePay.setPayType(1);
        servicePay.setDelFlag(0);
        servicePay.setCreateTime(LocalDateTime.now());
        servicePayService.save(servicePay);
        IntegralPay integralPay = new IntegralPay();
        integralPay.setUserId(data.getUserId());
        SysConfig data1 = sysConfigClient.getInfo(8L).getData();
        BigDecimal bigDecimal = amount.multiply(new BigDecimal(data1.getConfigValue())).setScale(2, RoundingMode.HALF_DOWN);
        integralPay.setIntegralCount(bigDecimal.intValue());
        integralPay.setAmount(amount);
        integralPay.setCode(code);
        integralPay.setPayStatus(1);
        integralPay.setDelFlag(0);
        integralPay.setCreateTime(LocalDateTime.now());


        integralPayService.save(integralPay);


//        return wechatPayService.unifiedOrderApplet(servicePay.getId()+"",code, site.getAnnualServiceFee()+"", "服务费缴纳",data.getOpenId(), "/other/wx/serviceCallback");
@@ -513,17 +534,17 @@
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser data = sysUserClient.getSysUser(userid).getData();

        if (data != null && data.getSiteId() != null) {
        if (data != null ) {
            if (data.getRoleType() == 1) {
                // 平台
                SysConfig data1 = sysConfigClient.getInfo(8L).getData();
                sysConfigClient.update(data1);
                TIntegralRule tIntegralRule = new TIntegralRule();
                tIntegralRule.setChargeCredit(data1.getConfigValue());
                tIntegralRule.setChargeCredit("{\"num1\":"+data1.getConfigValue()+"}");
                tIntegralRule.setContent(data1.getRemark());
                tIntegralRule.setSiteId(0);
                return R.ok(tIntegralRule);
            } else if (data.getRoleType() == 3){
            } else if (data.getRoleType() == 2){
                TIntegralRule res = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, data.getSiteId()).one();
                return R.ok(res);
            }else{
@@ -550,7 +571,9 @@

        if (data.getRoleType() == 1) {
            SysConfig data1 = sysConfigClient.getInfo(8L).getData();
            data1.setConfigValue(dto.getChargeCredit());
            JSONObject jsonObject = JSONObject.parseObject(dto.getChargeCredit());
            Integer num1 = jsonObject.getInteger("num1");
            data1.setConfigValue(num1.toString());
            data1.setRemark(dto.getContent());
            sysConfigClient.update(data1);
        } else {