zoujiajian 3 лет назад
Родитель
Сommit
ed696cc39d

+ 2 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/LuckyDrawRecord.java

@@ -16,6 +16,8 @@ public class LuckyDrawRecord extends BaseEntity{
 
 
 	private Long userId;
 	private Long userId;
 
 
+	private String nickname;
+
 	private Long drawId;
 	private Long drawId;
 
 
 	private Long orderId;
 	private Long orderId;

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

@@ -10,7 +10,6 @@ package com.cyksj.model.views;
 import com.cyksj.model.entity.LuckyDraw;
 import com.cyksj.model.entity.LuckyDraw;
 import com.cyksj.model.entity.LuckyDrawRecord;
 import com.cyksj.model.entity.LuckyDrawRecord;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -36,7 +35,7 @@ public class LuckyDrawRecordView {
 	@DbField("lr.name")
 	@DbField("lr.name")
 	private String name;
 	private String name;
 
 
-	@DbIgnore
+	@DbField("lr.nickname")
 	private String nickname;
 	private String nickname;
 
 
 	@DbField("lr.points")
 	@DbField("lr.points")

+ 2 - 0
netflix-service/src/main/java/com/cyksj/service/market/impl/MarketFrontServiceImpl.java

@@ -11,6 +11,7 @@ import com.cyksj.common.constant.PointsRecordConst;
 import com.cyksj.common.constant.TaskTypeEnum;
 import com.cyksj.common.constant.TaskTypeEnum;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.snowflake.Sequence;
 import com.cyksj.common.snowflake.Sequence;
+import com.cyksj.common.util.StringUtil;
 import com.cyksj.mapper.AddressMapper;
 import com.cyksj.mapper.AddressMapper;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.OrderDonTransportMapper;
 import com.cyksj.mapper.OrderDonTransportMapper;
@@ -202,6 +203,7 @@ public class MarketFrontServiceImpl implements MarketFrontService {
 		}
 		}
 		record.setUserId(userId);
 		record.setUserId(userId);
 		record.setDrawId(luckyDraw.getId());
 		record.setDrawId(luckyDraw.getId());
+		record.setNickname(StringUtil.anonymity(user.getNickname().toCharArray()));
 		luckyDrawRecordMapper.insert(record);
 		luckyDrawRecordMapper.insert(record);
 		return luckyDraw;
 		return luckyDraw;
 	}
 	}

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

@@ -3,11 +3,9 @@ package com.cyksj.web.controller.market;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.Jsons;
-import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.UserMapper;
-import com.cyksj.model.entity.User;
 import com.cyksj.model.request.LuckyDrawReq;
 import com.cyksj.model.request.LuckyDrawReq;
 import com.cyksj.model.views.LuckyDrawRecordView;
 import com.cyksj.model.views.LuckyDrawRecordView;
 import com.cyksj.model.views.LuckyDrawView;
 import com.cyksj.model.views.LuckyDrawView;
@@ -77,12 +75,6 @@ public class LuckyDrawFrontController {
 	@GetMapping("/get/record")
 	@GetMapping("/get/record")
 	public Result<SearchResult<LuckyDrawRecordView>> getLuckyDrawRecord(HttpServletRequest request) {
 	public Result<SearchResult<LuckyDrawRecordView>> getLuckyDrawRecord(HttpServletRequest request) {
 		SearchResult<LuckyDrawRecordView> search = beanSearcher.search(LuckyDrawRecordView.class, MapUtils.flatBuilder(request.getParameterMap()).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);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 	}