From bef045d5b14b246bc0b7afaca19c8ec1020aeb1d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 18:05:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java
index 1e11b1a..31b7822 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
@@ -16,6 +17,7 @@
import com.ruoyi.system.export.BigGiftPackageImport;
import com.ruoyi.system.export.TBigGiftPackageOrderExport;
import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.AppUserListQuery;
import com.ruoyi.system.query.BigGiftPackageOrderQuery;
import com.ruoyi.system.query.OrderTransferQuery;
import com.ruoyi.system.service.*;
@@ -315,6 +317,28 @@
return R.ok(tOrderTransferVo);
}
+
+ @ApiOperation(value = "订单转让删除")
+ @DeleteMapping(value = "/transferDelete/{id}")
+ @Log(title = "订单转让-删除", businessType = BusinessType.DELETE)
+ public R<String> transferDelete(@PathVariable Integer id) {
+ TOrderTransfer orderTransfer = tOrderTransferService.getById(id);
+ if (orderTransfer == null) {
+ return R.fail("订单转让不存在");
+ }
+ orderTransfer.setDelFlag(1);
+ tOrderTransferService.updateById(orderTransfer);
+ return R.ok() ;
+ }
+
+
+ @ApiOperation(value = "用户管理分页列表")
+ @PostMapping(value = "/transferPageUserList")
+ public R<PageInfo<TAppUser>> transferPageUserList(@RequestBody AppUserListQuery query) {
+ return R.ok(tAppUserService.transferPageUserList(query));
+ }
+
+
}
--
Gitblit v1.7.1