fix 中奖记录

netflix-common/src/main/java/com/cyksj/common/util/StringUtil.java

@@ -408,4 +408,23 @@ public final class StringUtil {
 			sb.append(randomStr.charAt(number));
 		}
 	}
+
+	/**
+	 * 姓名匿名
+	 */
+	public static String anonymity(char[] name) {
+		final int size = name.length;
+
+		char[] chars = new char[3];
+		if (size == 1 || size == 2) {
+			chars[0] = '*';
+			chars[1] = ' ';
+			chars[2] = name[size - 1];
+		} else {
+			chars[0] = '*';
+			chars[1] = name[size - 2];
+			chars[2] = name[size - 1];
+		}
+		return new String(chars);
+	}
 }

netflix-dao/src/main/java/com/cyksj/model/views/LuckyDrawRecordView.java

@@ -10,10 +10,13 @@ package com.cyksj.model.views;
 import com.cyksj.model.entity.LuckyDraw;
 import com.cyksj.model.entity.LuckyDrawRecord;
 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;
+
 @Getter
 @Setter
 @SearchBean(tables = "lucky_draw_record lr" +
@@ -33,6 +36,9 @@ public class LuckyDrawRecordView {
 	@DbField("lr.name")
 	private String name;
 
+	@DbIgnore
+	private String nickname;
+
 	@DbField("lr.points")
 	private Integer points;
 
@@ -65,4 +71,7 @@ public class LuckyDrawRecordView {
 
 	@DbField("lr.status")
 	private LuckyDrawRecord.Status status;
+
+	@DbField("lr.created_time")
+	private Date createdTime;
 }

netflix-web/src/main/java/com/cyksj/web/controller/market/LuckyDrawFrontController.java

@@ -3,8 +3,11 @@ package com.cyksj.web.controller.market;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
+import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.UserMapper;
+import com.cyksj.model.entity.User;
 import com.cyksj.model.request.LuckyDrawReq;
 import com.cyksj.model.views.LuckyDrawRecordView;
 import com.cyksj.model.views.LuckyDrawView;
@@ -39,6 +42,8 @@ public class LuckyDrawFrontController {
 
 	private final MarketFrontService marketFrontService;
 
+	private final UserMapper userMapper;
+
 	/**
 	 * 奖品列表
 	 */
@@ -68,9 +73,13 @@ public class LuckyDrawFrontController {
 	 */
 	@GetMapping("/get/record")
 	public Result<SearchResult<LuckyDrawRecordView>> getLuckyDrawRecord(HttpServletRequest request) {
-		Long userId = StpUserUtil.getLoginIdAsLong();
-		SearchResult<LuckyDrawRecordView> search = beanSearcher.search(LuckyDrawRecordView.class, MapUtils.flatBuilder(request.getParameterMap())
-				.field(LuckyDrawRecordView::getUserId, userId).op(Operator.Equal).build());
+		SearchResult<LuckyDrawRecordView> search = beanSearcher.search(LuckyDrawRecordView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		search.getDataList().forEach(data -> {
+			User user = userMapper.selectById(data.getUserId());
+			if (user != null) {
+				data.setNickname(StringUtil.anonymity(user.getNickname().toCharArray()));
+			}
+		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}