소스 검색

fix 后台用户分销订单列表

zoujiajian 1 년 전
부모
커밋
04adb251e3
1개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 5 4
      netflix-dao/src/main/java/com/cyksj/model/views/DistributeOrdersDetailView.java

+ 5 - 4
netflix-dao/src/main/java/com/cyksj/model/views/DistributeOrdersDetailView.java

@@ -18,9 +18,10 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "distribute_waiting_send_points dp inner join order_don od on od.id = dp.order_id" +
+@SearchBean(tables = "distribute_waiting_send_points dp left join order_don od on od.id = dp.order_id and dp.is_vip = false" +
+		" left join vip_order_don vod on vod.id = dp.order_id and dp.is_vip = true" +
 		" inner join user u on u.id = dp.user_id" +
-		" left join goods_don gd on gd.id = od.goods_id")
+		" left join goods_don gd on gd.id = ifnull(od.goods_id,vod.goods_id)")
 public class DistributeOrdersDetailView {
 	@DbField("u.nickname")
 	private String nickname;
@@ -38,10 +39,10 @@ public class DistributeOrdersDetailView {
 	@DbField("gd.title")
 	private String platform;
 
-	@DbField("if(od.is_dp and od.ori_money != 0,od.ori_money,od.money)")
+	@DbField("if(od.id is null,vod.money,if(od.is_dp and od.ori_money != 0,od.ori_money,od.money))")
 	private BigDecimal money;
 
-	@DbField("od.created_time")
+	@DbField("ifnull(od.created_time,vod.created_time)")
 	private Date orderTime;
 
 	@DbField("dp.points")