fix 明细数据返回

netflix-dao/src/main/java/com/cyksj/model/entity/EquipmentUserChanceRecord.java

@@ -1,8 +1,13 @@
 package com.cyksj.model.entity;
 
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /*
  *项目名: netflix
  *文件名: EquipmentUserChanceRecord
@@ -11,21 +16,32 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@SearchBean(tables = "equipment_user_chance_record er")
 public class EquipmentUserChanceRecord extends BaseEntity{
 	/**
 	 * 受益人id
 	 */
+	@DbField("er.share_id")
 	private Long shareId;
 
 	/**
 	 * 被邀请人id
 	 */
+	@DbField("er.user_id")
 	private Long userId;
 
+	@DbField("er.order_id")
 	private Long orderId;
 
+	@DbField("er.status")
 	private Status status;
 
+	@DbIgnore
+	private String nickname;
+
+	@DbIgnore
+	private Date payTime;
+
 
 	@Getter
 	public enum Status {

netflix-web/src/main/java/com/cyksj/web/controller/distribute/EquipmentDistributeController.java

@@ -9,6 +9,8 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.OrderDonMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserChanceMapper;
 import com.cyksj.model.dto.EquipmentConfigDto;
 import com.cyksj.model.entity.*;
@@ -58,6 +60,10 @@ public class EquipmentDistributeController {
 
 	private final RedisService redisService;
 
+	private final UserMapper userMapper;
+
+	private final OrderDonMapper orderDonMapper;
+
 	/**
 	 * 个人实物分销详情
 	 */
@@ -87,6 +93,10 @@ public class EquipmentDistributeController {
 		SearchResult<EquipmentUserChanceRecord> search = beanSearcher.search(EquipmentUserChanceRecord.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(EquipmentUserChanceRecord::getShareId, userId)
 				.build());
+		search.getDataList().forEach(data->{
+			Optional.ofNullable(userMapper.selectById(data.getUserId())).ifPresent(user -> data.setNickname(user.getNickname()));
+			Optional.ofNullable(orderDonMapper.selectById(data.getOrderId())).ifPresent(oder -> data.setPayTime(oder.getPayTime()));
+		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}