From 6cca8f6b62cff87bde6108f0fddc1822e865a8ef Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 22 七月 2025 18:10:26 +0800
Subject: [PATCH] 大屏替换路径
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index abe14db..9d44070 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -3,6 +3,8 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.account.api.dto.GiveVipDto;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.common.core.domain.R;
@@ -28,6 +30,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -57,7 +60,7 @@
private TVipOrderService vipOrderService;
@Resource
private AppUserClient appUserClient;
- @Resource
+ @Autowired
private OtherClient otherClient;
@@ -94,11 +97,28 @@
}
+ @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 = {"管理后台-会员订单"})
public AjaxResult deleteVipOrder(String id) {
- vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
+ vipOrderService.update(new LambdaUpdateWrapper<TVipOrder>().in(TVipOrder::getId, Arrays.asList(id.split(",")))
+ .set(TVipOrder::getDelFlag, 1));
return AjaxResult.success();
}
@@ -106,7 +126,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 +134,8 @@
giveVipDto.setVipId(one.getVipId());
giveVipDto.setType(one.getVipType());
giveVipDto.setUserIds(one.getAppUserId().toString());
-
-
-
appUserClient.giveVip(giveVipDto);
-
return R.ok();
-
}
--
Gitblit v1.7.1