From 9d892ebf469fba1b972254f5329819a78bca8bc5 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 25 十二月 2025 15:57:01 +0800
Subject: [PATCH] 后台接口

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageOrderController.java |   24 +++++++++++++++++-------
 1 files changed, 17 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 31b7822..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,6 +3,7 @@
 
 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;
@@ -34,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;
@@ -155,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);
 
 
@@ -171,6 +177,10 @@
             TCompany tCompany = tCompanyService.getById(companyId);
             tBigGiftPackageOrder.setCompanyName(tCompany.getName());
         }
+
+
+        tBigGiftPackageOrder.setUserName(appUser.getName());
+        tBigGiftPackageOrder.setPhone(appUser.getPhone());
         return R.ok(tBigGiftPackageOrder);
     }
 

--
Gitblit v1.7.1