fix 固定推广者订单标识

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

@@ -81,6 +81,11 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Boolean isDistribute;
 
+    /**
+     * 是否是固定推广者分销
+     */
+    private Boolean isFixedDistribute;
+
     public enum Status {
         /**
          * 订单状态

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

@@ -16,10 +16,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "order_don od left join user_distribute_shared uds on uds.user_id = od.user_id" +
-		" left join user_distribute ud on ud.user_id = uds.shared_id and ud.deleted is true" +
-		" left 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')")
+@SearchBean(tables = "order_don od left 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')")
 public class DistributeOrdersView {
 	@DbField("od.id")
 	private Long id;
@@ -27,15 +25,12 @@ public class DistributeOrdersView {
 	@DbField("od.money")
 	private BigDecimal money;
 
-	@DbField("uds.shared_id")
-	private Long sharedId;
-
-	@DbField("ud.user_id")
-	private Long userId;
-
 	@DbField("od.status")
 	private String status;
 
+	@DbField("od.is_fixed_distribute")
+	private Boolean isFixedDistribute;
+
 	@DbField("od.created_time")
 	private Date createdTime;
 }

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

@@ -187,13 +187,13 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		backgroundDataView.setDistributeOrders(distributeOrders.size());
 		//固定推广者订单
 		List<DistributeOrdersView> distributePopularizeOrders = Optional.ofNullable(beanSearcher.searchAll(DistributeOrdersView.class, MapUtils.builder()
-				.field(DistributeOrdersView::getUserId).op(Operator.NotNull)
+				.field(DistributeOrdersView::getIsFixedDistribute,true).op(Operator.Equal)
 				.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::getUserId).op(Operator.IsNull)
+				.field(DistributeOrdersView::getIsFixedDistribute,false).op(Operator.Equal)
 				.field(DistributeOrdersView::getCreatedTime, startDate, endDate).op(Operator.Between)
 				.build())).orElse(new ArrayList<>());
 		backgroundDataView.setDistributeOriginalOrders(distributeOriginalOrders.size());

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -226,6 +226,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class).eq(UserDistributeShared::getUserId, user.getId()).last("limit 1"));
 			if (userDistributeShared != null) {
 				orderDon.setIsDistribute(true);
+				UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, user.getId()));
+				if (userDistribute != null) {
+					orderDon.setIsFixedDistribute(true);
+				}
 			}
 		}
 		this.saveOrUpdate(orderDon);