fix

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

@@ -18,7 +18,8 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = " user_distribute_shared uds INNER JOIN user u ON u.id = uds.user_id" +
 		" LEFT JOIN distribute_waiting_send_points dwsp ON dwsp.user_id = uds.user_id",
-		where = "uds.remark = 'cc'")
+		where = "uds.remark = 'cc'",
+		groupBy = "uds.shared_id,uds.user_id,u.nickname,u.headimgurl,uds.created_time")
 public class CcPromotionInvitationDetailView {
 	/**
 	 * 分销用户id
@@ -49,13 +50,13 @@ public class CcPromotionInvitationDetailView {
 	/**
 	 * 提成状态
 	 */
-	@DbField("dwsp.send_status")
+	@DbIgnore
 	private DistributeWaitingSendPoints.Status status;
 
 	/**
 	 * 首单订单ID
 	 */
-	@DbField("dwsp.order_id")
+	@DbIgnore
 	private Long firstOrderId;
 
 	/**
@@ -73,12 +74,12 @@ public class CcPromotionInvitationDetailView {
 	/**
 	 * 返现提成
 	 */
-	@DbField("TRUNCATE(dwsp.points/1000,2)")
+	@DbIgnore
 	private BigDecimal reMoney = BigDecimal.ZERO;
 
 	/**
 	 * 邀请时间
 	 */
-	@DbField("ifnull(dwsp.update_time,uds.created_time)")
+	@DbField("ifnull(max(dwsp.update_time),uds.created_time)")
 	private Date updateTime;
 }

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

@@ -46,4 +46,10 @@ public class DistributeWaitingPointsOrderDetailView {
 
 	@DbField("dw.send_status")
 	private DistributeWaitingSendPoints.Status status;
+
+	/**
+	 * 返现提成
+	 */
+	@DbField("TRUNCATE(dw.points/1000,2)")
+	private BigDecimal reMoney = BigDecimal.ZERO;
 }

netflix-web/src/main/java/com/cyksj/web/controller/claude/ClaudeCodeController.java

@@ -557,14 +557,16 @@ public class ClaudeCodeController {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		SearchResult<CcPromotionInvitationDetailView> search = beanSearcher.search(CcPromotionInvitationDetailView.class, MapUtils.flatBuilder(request.getParameterMap()).field(CcPromotionInvitationDetailView::getSharedId, userId).orderBy(CcPromotionInvitationDetailView::getUpdateTime).desc().build());
 		search.getDataList().forEach(data -> {
-			DistributeWaitingPointsOrderDetailView detailView = beanSearcher.searchFirst(DistributeWaitingPointsOrderDetailView.class, MapUtils.builder().put("uid", userId).field(DistributeWaitingPointsOrderDetailView::getStatus, DistributeWaitingSendPoints.Status.close.name()).op(Operator.NotEqual).build());
+			DistributeWaitingPointsOrderDetailView detailView = beanSearcher.searchFirst(DistributeWaitingPointsOrderDetailView.class, MapUtils.builder().put("uid", data.getUserId()).field(DistributeWaitingPointsOrderDetailView::getStatus, DistributeWaitingSendPoints.Status.close.name()).op(Operator.NotEqual).build());
 			if (detailView == null) {
-				detailView = beanSearcher.searchFirst(DistributeWaitingPointsOrderDetailView.class, MapUtils.builder().put("uid", userId).field(DistributeWaitingPointsOrderDetailView::getStatus, DistributeWaitingSendPoints.Status.close.name()).build());
+				detailView = beanSearcher.searchFirst(DistributeWaitingPointsOrderDetailView.class, MapUtils.builder().put("uid", data.getUserId()).field(DistributeWaitingPointsOrderDetailView::getStatus, DistributeWaitingSendPoints.Status.close.name()).build());
 			}
 			if (detailView != null) {
 				data.setFirstOrderId(detailView.getOrderId());
 				data.setOrderMoney(detailView.getOrderMoney());
 				data.setSpecVal(detailView.getSpecVal());
+				data.setStatus(detailView.getStatus());
+				data.setReMoney(detailView.getReMoney());
 			}
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);