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 | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 1b3f9d6..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
@@ -9,10 +9,12 @@
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;
@@ -42,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;
}
@@ -68,6 +72,12 @@
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