fix 后台渠道head

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

@@ -16,21 +16,19 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "order_don od inner join distribute_waiting_send_points dp on dp.order_id = od.id",
-		where = "od.is_distribute is true and od.status not in ('close','noPayment','refund')")
+@SearchBean(tables = "distribute_waiting_send_points dp left join order_don od on dp.order_id = od.id and dp.is_vip = false" +
+		" left join vip_order_don vod on vod.id = dp.order_id and dp.is_vip = true",
+		where = "ifnull(od.status,vod.status) not in ('close','noPayment','refund') :f:")
 public class DistributeOrdersView {
-	@DbField("od.id")
+	@DbField("dp.order_id")
 	private Long id;
 
-	@DbField("od.money")
+	@DbField("ifnull(od.money,vod.money)")
 	private BigDecimal money;
 
-	@DbField("od.status")
+	@DbField("ifnull(od.status,vod.status)")
 	private String status;
 
-	@DbField("od.is_fixed_distribute")
-	private Boolean isFixedDistribute;
-
-	@DbField("od.created_time")
+	@DbField("ifnull(od.created_time,vod.created_time)")
 	private Date createdTime;
 }

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -1084,13 +1084,13 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		backgroundDataView.setDistributeOrders(distributeOrders.size());
 		//固定推广者订单
 		List<DistributeOrdersView> distributePopularizeOrders = Optional.ofNullable(beanSearcher.searchAll(DistributeOrdersView.class, MapUtils.builder()
-				.field(DistributeOrdersView::getIsFixedDistribute, true).op(Operator.Equal)
+				.put("f", " and ifnull(od.is_fixed_distribute,vod.is_fixed_distribute) = 1")
 				.field(DistributeOrdersView::getCreatedTime, startDate, endDate).op(Operator.Between)
 				.build())).orElse(new ArrayList<>());
 		backgroundDataView.setDistributePopularizeOrders(distributePopularizeOrders.size());
 		//普通分销单数
 		List<DistributeOrdersView> distributeOriginalOrders = Optional.ofNullable(beanSearcher.searchAll(DistributeOrdersView.class, MapUtils.builder()
-				.field(DistributeOrdersView::getIsFixedDistribute, false).op(Operator.Equal)
+				.put("f", " and ifnull(od.is_fixed_distribute,vod.is_fixed_distribute) = 0")
 				.field(DistributeOrdersView::getCreatedTime, startDate, endDate).op(Operator.Between)
 				.build())).orElse(new ArrayList<>());
 		backgroundDataView.setDistributeOriginalOrders(distributeOriginalOrders.size());