From 9926a6a4f76c9292e2bfbefbce9bcb4122fd577a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 十二月 2025 09:34:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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..218972d 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
@@ -3,9 +3,11 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.alibaba.fastjson.JSONObject;
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 +18,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.*;
@@ -32,6 +35,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -153,14 +157,18 @@
tBigGiftPackageOrder.setPartnerName(lastUser.getName());
}
}
- Integer bigGiftPackageId = tBigGiftPackageOrder.getBigGiftPackageId();
- TBigGiftPackage tBigGiftPackage = tBigGiftPackageService.getById(bigGiftPackageId);
- tBigGiftPackageOrder.setBigGiftPackageName(tBigGiftPackage.getName());
- tBigGiftPackageOrder.setBigGiftPackageCover(tBigGiftPackage.getCoverImage());
- tBigGiftPackageOrder.setBigGiftPackagePrice(tBigGiftPackage.getTotalPrice());
- tBigGiftPackageOrder.setBigGiftPackageIntro(tBigGiftPackage.getIntroduction());
+ String bigGiftPackage = tBigGiftPackageOrder.getBigGiftPackage();
+ if(bigGiftPackage!=null){
+ JSONObject jsonObject = JSONObject.parseObject(bigGiftPackage);
+ tBigGiftPackageOrder.setBigGiftPackageName(jsonObject.getString("name"));
+ tBigGiftPackageOrder.setBigGiftPackageCover(jsonObject.getString("coverImage"));
+ tBigGiftPackageOrder.setBigGiftPackagePrice(new BigDecimal(jsonObject.getString("totalPrice")));
+ tBigGiftPackageOrder.setBigGiftPackageIntro(jsonObject.getString("introduction"));
+ }
+
+
// 销量
- long count = tBigGiftPackageOrderService.count(new LambdaQueryWrapper<TBigGiftPackageOrder>().eq(TBigGiftPackageOrder::getBigGiftPackageId, bigGiftPackageId).ne(TBigGiftPackageOrder::getStatus, 5));
+ long count = tBigGiftPackageOrderService.count(new LambdaQueryWrapper<TBigGiftPackageOrder>().eq(TBigGiftPackageOrder::getBigGiftPackageId, tBigGiftPackageOrder.getBigGiftPackageId()).ne(TBigGiftPackageOrder::getStatus, 5));
tBigGiftPackageOrder.setBigGiftPackageSales((int)count);
@@ -169,6 +177,10 @@
TCompany tCompany = tCompanyService.getById(companyId);
tBigGiftPackageOrder.setCompanyName(tCompany.getName());
}
+
+
+ tBigGiftPackageOrder.setUserName(appUser.getName());
+ tBigGiftPackageOrder.setPhone(appUser.getPhone());
return R.ok(tBigGiftPackageOrder);
}
@@ -315,6 +327,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