添加商城和商户业务员名字查询

ldt-core/src/main/java/org/springblade/ldt/mall/vo/MallVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.ldt.mall.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.ldt.mall.entity.Mall;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,4 +34,6 @@ import io.swagger.annotations.ApiModel;
 public class MallVO extends Mall {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("销售员名字")
+	private String salesmanName;
 }

ldt-core/src/main/java/org/springblade/ldt/mall/wrapper/MallWrapper.java

@@ -16,11 +16,17 @@
  */
 package org.springblade.ldt.mall.wrapper;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.ldt.mall.entity.Mall;
 import org.springblade.ldt.mall.vo.MallVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * 包装类,返回视图层所需的字段
@@ -30,6 +36,8 @@ import java.util.Objects;
  */
 public class MallWrapper extends BaseEntityWrapper<Mall, MallVO>  {
 
+	private static final IUserService userService = SpringContextHolder.getBean(IUserService.class);
+
 	public static MallWrapper build() {
 		return new MallWrapper();
  	}
@@ -43,6 +51,14 @@ public class MallWrapper extends BaseEntityWrapper<Mall, MallVO>  {
 		//mallVO.setCreateUserName(createUser.getName());
 		//mallVO.setUpdateUserName(updateUser.getName());
 
+		//查询业务员名字
+		if(ObjectUtils.isNotEmpty(mallVO.getSalesmanId())){
+			User user = userService.getById(mallVO.getSalesmanId());
+			if(ObjectUtils.isNotEmpty(user)){
+				mallVO.setSalesmanName(user.getName());
+			}
+		}
+
 		return mallVO;
 	}
 

ldt-core/src/main/java/org/springblade/ldt/shop/vo/ShopVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.ldt.shop.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.ldt.shop.entity.Shop;
 import lombok.Data;
@@ -35,4 +36,7 @@ public class ShopVO extends Shop {
 	private static final long serialVersionUID = 1L;
 
 	private Kv tokenInfo;
+
+	@ApiModelProperty("销售员名字")
+	private String salesmanName;
 }

ldt-core/src/main/java/org/springblade/ldt/shop/wrapper/ShopWrapper.java

@@ -16,10 +16,15 @@
  */
 package org.springblade.ldt.shop.wrapper;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.shop.vo.ShopVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+
 import java.util.Objects;
 
 /**
@@ -28,21 +33,32 @@ import java.util.Objects;
  * @author BladeX
  * @since 2021-09-23
  */
-public class ShopWrapper extends BaseEntityWrapper<Shop, ShopVO>  {
+public class ShopWrapper extends BaseEntityWrapper<Shop, ShopVO> {
+
+	private static final IUserService userService = SpringContextHolder.getBean(IUserService.class);
 
 	public static ShopWrapper build() {
 		return new ShopWrapper();
- 	}
+	}
 
 	@Override
 	public ShopVO entityVO(Shop shop) {
 		ShopVO shopVO = Objects.requireNonNull(BeanUtil.copy(shop, ShopVO.class));
 
+
 		//User createUser = UserCache.getUser(shop.getCreateUser());
 		//User updateUser = UserCache.getUser(shop.getUpdateUser());
 		//shopVO.setCreateUserName(createUser.getName());
 		//shopVO.setUpdateUserName(updateUser.getName());
 
+		//查询业务员名字
+		if (ObjectUtils.isNotEmpty(shopVO.getSalesmanId())) {
+			User user = userService.getById(shopVO.getSalesmanId());
+			if (ObjectUtils.isNotEmpty(user)) {
+				shopVO.setSalesmanName(user.getName());
+			}
+		}
+
 		return shopVO;
 	}