From 01de10c8e22e4b8aae07a210baa9294ec7a88c4b Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 25 十二月 2025 15:58:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
index b0771e0..3a51870 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
@@ -3,15 +3,18 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TPhysicalGoods;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.ruoyi.system.query.BigGiftPackageQuery;
+import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TPhysicalGoodsOrderService;
import com.ruoyi.system.service.TPhysicalGoodsService;
import io.swagger.annotations.Api;
@@ -23,6 +26,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.List;
@@ -40,10 +44,12 @@
public class TPhysicalGoodsOrderController {
private final TPhysicalGoodsOrderService tPhysicalGoodsOrderService;
private final TPhysicalGoodsService tPhysicalGoodsService;
+ private final TAppUserService tAppUserService;
- public TPhysicalGoodsOrderController(TPhysicalGoodsOrderService tPhysicalGoodsOrderService, TPhysicalGoodsService tPhysicalGoodsService) {
+ public TPhysicalGoodsOrderController(TPhysicalGoodsOrderService tPhysicalGoodsOrderService, TPhysicalGoodsService tPhysicalGoodsService, TAppUserService tAppUserService) {
this.tPhysicalGoodsOrderService = tPhysicalGoodsOrderService;
this.tPhysicalGoodsService = tPhysicalGoodsService;
+ this.tAppUserService = tAppUserService;
}
@@ -59,11 +65,19 @@
@GetMapping(value = "/detail/{id}")
public R<TPhysicalGoodsOrder> detail(@PathVariable("id") Long id) {
TPhysicalGoodsOrder order = tPhysicalGoodsOrderService.getById(id);
- TPhysicalGoods goods = tPhysicalGoodsService.getById(order.getPhysicalGoodsId());
- order.setPhysicalGoodsName(goods.getName());
- order.setPhysicalGoodsCover(goods.getCoverImage());
- order.setPhysicalGoodsPrice(goods.getTotalPrice());
- order.setPhysicalGoodsIntro(goods.getIntroduction());
+ String physicalGoods = order.getPhysicalGoods();
+ JSONObject jsonObject = JSONObject.parseObject(physicalGoods);
+// TPhysicalGoods goods = tPhysicalGoodsService.getById(order.getPhysicalGoodsId());
+ order.setPhysicalGoodsName(jsonObject.getString("name"));
+ order.setPhysicalGoodsCover(jsonObject.getString("coverImage"));
+ order.setPhysicalGoodsPrice(new BigDecimal(jsonObject.getString("totalPrice")).setScale(2, BigDecimal.ROUND_HALF_UP));
+ order.setPhysicalGoodsIntro(jsonObject.getString("introduction"));
+
+ Integer appUserId = order.getAppUserId();
+ TAppUser appUser = tAppUserService.getById(appUserId);
+ order.setUserName(appUser.getName());
+ order.setPhone(appUser.getPhone());
+
return R.ok(order);
}
--
Gitblit v1.7.1