From 8aa510ea43af4f4e36f226900ff653e78731688f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 11:29:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 6950884..9bad400 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
@@ -250,6 +250,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));
@@ -266,6 +269,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