Browse Source

添加 寄售用户手机号 字段

pangqijun 2 years ago
parent
commit
526849f8e6

+ 7 - 2
src/main/java/org/springblade/modules/api/controller/Api05Controller.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.api.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -240,8 +241,12 @@ public class Api05Controller extends BladeController {
 		List<Long> collect = list.stream().map(Consign::getConsignUserId).collect(Collectors.toList());
 		List<User> users = userService.listByIds(collect);
 		for (Consign consign : list) {
-			Optional<User> first = users.stream().filter(s -> s.getId() == consign.getConsignUserId()).findFirst();
-			consign.setConsignUserName(first.get().getName());
+			List<User> first = users.stream().filter(s -> s.getId().equals(consign.getConsignUserId())).collect(Collectors.toList());
+			if (CollUtil.isNotEmpty(first)) {
+				User user = first.get(0);
+				consign.setConsignUserName(user.getRealName());
+				consign.setConsignUserPhone(user.getPhone());
+			}
 		}
 		return R.data(list);
 	}

+ 5 - 0
src/main/java/org/springblade/modules/shopping/entity/Consign.java

@@ -110,9 +110,14 @@ public class Consign implements Serializable {
 	@ApiModelProperty(value = "寄售用户ID")
 	private Long consignUserId;
 
+	@TableField(exist = false)
 	@ApiModelProperty(value = "寄售用户名称")
 	private String consignUserName;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "寄售用户手机号")
+	private String consignUserPhone;
+
 	/**
 	 * 寄售类型
 	 */