zoujiajian 3 anni fa
parent
commit
801735fa1e

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeOrdersDetailView.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "(select o.id,o.user_id,o.goods_id,o.sku_id,o.money,o.refund_money,o.coupon_money,o.created_time from order_don o inner join (select user_id from user_distribute_shared where :sharedId:) us on us.user_id = o.user_id where o.is_fixed_distribute is true and o.relation_id != 0 and o.status not in ('close','noPayment') :time:) od" +
 		" left join goods_don g on g.id = od.goods_id" +
-		" left join distribute_waiting_send_points dp on dp.order_id = od.id")
+		" inner join distribute_waiting_send_points dp on dp.order_id = od.id")
 public class UserDistributeOrdersDetailView {
 
 	@DbField("select nickname from user where id = od.user_id limit 1")

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeOrdersStatisticsView.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @SearchBean(tables = "(select o.id,o.user_id,o.goods_id,o.money,o.refund_money,o.status from order_don o inner join (select user_id from user_distribute_shared where :sharedId:) us on us.user_id = o.user_id where o.is_fixed_distribute is true and o.relation_id != 0 and o.status not in ('close','noPayment') :time:) od left join goods_don g on g.id = od.goods_id" +
-		" left join distribute_waiting_send_points dp on dp.order_id = od.id",
+		" inner join distribute_waiting_send_points dp on dp.order_id = od.id",
 		groupBy = "od.goods_id,g.title")
 public class UserDistributeOrdersStatisticsView {
 

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

@@ -14,11 +14,15 @@ import lombok.Setter;
 @Getter
 @Setter
 @SearchBean(tables = "goods_don g left join user_plat_distribute_rate upr on upr.goods_id = g.id :distribute_id:",
-		where = "g.type = 1 and g.deleted is true and g.status is true")
+		where = "g.type = 1 and g.deleted is true and g.status is true and upr.rate > 0")
 public class UserDistributeRateView {
+
+	@DbField("g.category")
+	private Integer category;
+
 	@DbField("g.title")
 	private String title;
 
 	@DbField("upr.rate")
-	private Integer rate = 0;
+	private Integer rate;
 }