fix 优惠券提示窗邀请人信息;被邀请人下单未获得权益

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
@@ -37,9 +38,11 @@ public class EquipmentUserChanceRecord extends BaseEntity{
 	private Status status;
 
 	@DbIgnore
+	@TableField(exist = false)
 	private String nickname;
 
 	@DbIgnore
+	@TableField(exist = false)
 	private Date payTime;
 
 

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

@@ -0,0 +1,24 @@
+package com.cyksj.model.views;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/*
+ *项目名: netflix
+ *文件名: EquipmentCouponView
+ *创建者: JavaZou
+ *创建时间:2023/3/2 11:31
+ */
+@Getter
+@Setter
+public class EquipmentCouponView {
+	private Long userId;
+
+	private String nickname;
+
+	private String headImg;
+
+	private List<CouponUserView> couponList;
+}

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

@@ -13,12 +13,14 @@ 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.mapper.manage.distribute.equipment.EquipmentUserDistributeInviteRecordMapper;
 import com.cyksj.model.dto.EquipmentConfigDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.request.LoginPhoneReq;
 import com.cyksj.model.request.ReceiveBenefitsReq;
 import com.cyksj.model.views.CouponUserView;
+import com.cyksj.model.views.EquipmentCouponView;
 import com.cyksj.model.views.EquipmentDistributeView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.distribute.equipment.EquipmentDistributeFrontService;
@@ -69,6 +71,8 @@ public class EquipmentDistributeController {
 
 	private final EquipmentDistributeService equipDistributeService;
 
+	private final EquipmentUserDistributeInviteRecordMapper inviteRecordMapper;
+
 	/**
 	 * 个人实物分销详情
 	 */
@@ -164,16 +168,28 @@ public class EquipmentDistributeController {
 	 * 新用户领取后分销优惠券后弹窗
 	 */
 	@GetMapping("/get/couponList")
-	public Result<List<CouponUserView>> getEquipmentCouponList() {
+	public Result<EquipmentCouponView> getEquipmentCouponList() {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		Object value = redisService.get(RedisService.key.EQUIPMENT_DISTRIBUTE_COUPON_KEY.getNameFormat(userId));
 		if (value != null) {
+			EquipmentCouponView equipmentCouponView = new EquipmentCouponView();
 			List<CouponUserView> couponUserViews = beanSearcher.searchAll(CouponUserView.class, MapUtils.builder()
 					.field(CouponUserView::getUserId, userId)
 					.field(CouponUserView::getChannel, CouponUser.Channel.equipment.name())
 					.orderBy(CouponUserView::getOrderBy).asc()
 					.build());
-			return GatewayResponse.SUCCESS.newBuilder().toResult(couponUserViews);
+			EquipmentUserDistributeInviteRecord record = inviteRecordMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserDistributeInviteRecord.class)
+					.eq(EquipmentUserDistributeInviteRecord::getUserId, userId).last("limit 1"));
+			if (record != null) {
+				User user = userMapper.selectById(record.getShareId());
+				Optional.ofNullable(user).ifPresent(u->{
+					equipmentCouponView.setNickname(u.getNickname());
+					equipmentCouponView.setUserId(u.getId());
+					equipmentCouponView.setHeadImg(u.getHeadimgurl());
+				});
+			}
+			equipmentCouponView.setCouponList(couponUserViews);
+			return GatewayResponse.SUCCESS.newBuilder().toResult(equipmentCouponView);
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}