bug修改

无关风月

2025-02-07 8a038cf6f0792cfe260a94e86d954b50f068e758

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java

@@ -94,6 +94,22 @@
    }
    
    
    @PostMapping("/addVipOrder1")
    public R<Long> addVipOrder1(@RequestBody TVipOrder dto) {
        if (dto.getId()!=null){
            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode())
                    .ne(TVipOrder::getId, dto.getId()).list();
            if (!list.isEmpty())return R.fail("订单编号已存在");
        }else{
            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
            if (!list.isEmpty())return R.fail("订单编号已存在");
        }
        vipOrderService.saveOrUpdate(dto);
        return R.ok(dto.getId());
    }
    
    
    
    @RequiresPermissions(value = {"/vipOrder/del"}, logical = Logical.OR)
    @GetMapping("/deleteVipOrder")
    @ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
@@ -106,7 +122,6 @@

    @PostMapping("/callBack")
    public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){

        TVipOrder one = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, code).one();
        one.setSerialNumber(outTradeNo);
        one.setPaymentStatus(2);
@@ -115,13 +130,8 @@
        giveVipDto.setVipId(one.getVipId());
        giveVipDto.setType(one.getVipType());
        giveVipDto.setUserIds(one.getAppUserId().toString());



        appUserClient.giveVip(giveVipDto);

        return R.ok();

    }