From aa640c2dc1d75aeda0390a2f0c71bbfa24ee4105 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 11:28:56 +0800
Subject: [PATCH] 1

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsAppUser.java       |   12 ++++++++++++
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |   11 +++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsAppUser.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsAppUser.java
index e430c97..6cf7b05 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsAppUser.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsAppUser.java
@@ -38,6 +38,18 @@
     @TableField("app_user_id")
     private Long appUserId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "用户手机号")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "会员等级")
+    private String vipName;
+
 
     public String getIdStr() {
         return String.valueOf(id);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 47f74b0..df253d9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -251,6 +251,9 @@
     @Override
     public Goods getManageGoodsDetail(Long goodsId) {
         Goods goods = getById(goodsId);
+        if (goods == null){
+            return null;
+        }
         // 指定门店
         List<GoodsShop> goodsShops = goodsShopService.list(new LambdaQueryWrapper<GoodsShop>()
                 .eq(GoodsShop::getGoodsId, goodsId));
@@ -267,6 +270,14 @@
         // 指定用户
         List<GoodsAppUser> goodsAppUserList = goodsAppUserService.list(new LambdaQueryWrapper<GoodsAppUser>()
                 .eq(GoodsAppUser::getGoodsId, goodsId));
+        for (GoodsAppUser goodsAppUser : goodsAppUserList) {
+            AppUser appUser = appUserClient.getAppUserById(goodsAppUser.getAppUserId());
+            goodsAppUser.setUserName(appUser.getName());
+            goodsAppUser.setPhone(appUser.getPhone());
+            VipSetting vipSetting = vipSettingService.getById(appUser.getVipId());
+            goodsAppUser.setVipName(vipSetting.getVipName());
+        }
+
         goods.setGoodsAppUserList(goodsAppUserList);
 
         // 会员价格

--
Gitblit v1.7.1