zoujiajian 11 місяців тому
батько
коміт
4cebf243a4

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

@@ -49,7 +49,7 @@ public class CcPromotionInvitationDetailView {
 	/**
 	 * 提成状态
 	 */
-	@DbField("dwsp.status")
+	@DbField("dwsp.send_status")
 	private DistributeWaitingSendPoints.Status status;
 
 	/**
@@ -79,6 +79,6 @@ public class CcPromotionInvitationDetailView {
 	/**
 	 * 邀请时间
 	 */
-	@DbField("dwsp.update_time")
+	@DbField("ifnull(dwsp.update_time,uds.created_time)")
 	private Date updateTime;
 }

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

@@ -29,7 +29,7 @@ public class DistributeWaitingPointsOrderDetailView {
 	/**
 	 * 首单订单ID
 	 */
-	@DbField("dwsp.order_id")
+	@DbField("dw.order_id")
 	private Long orderId;
 
 	/**
@@ -41,9 +41,9 @@ public class DistributeWaitingPointsOrderDetailView {
 	/**
 	 * 订单金额
 	 */
-	@DbField("o.order_money")
+	@DbField("o.money")
 	private BigDecimal orderMoney;
 
-	@DbField("dw.status")
+	@DbField("dw.send_status")
 	private DistributeWaitingSendPoints.Status status;
 }

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

@@ -555,7 +555,7 @@ public class ClaudeCodeController {
 	@GetMapping("/get/cc/promotion/invitation/details")
 	public Result<SearchResult<CcPromotionInvitationDetailView>> getCcPromotionInvitationDetails() {
 		long userId = StpUserUtil.getLoginIdAsLong();
-		SearchResult<CcPromotionInvitationDetailView> search = beanSearcher.search(CcPromotionInvitationDetailView.class, MapUtils.flatBuilder(request.getParameterMap()).field(CcPromotionInvitationDetailView::getSharedId, userId).build());
+		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());
 			if (detailView == null) {