zoujiajian 2 лет назад
Родитель
Сommit
754499e370

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

@@ -18,9 +18,9 @@ public class ShopGeneralGoodsRateView {
 	@DbField("g.id")
 	private Long goodsId;
 
-	@DbField("g.rate")
+	@DbField("g.title")
 	private String title;
 
-	@DbField("yr.rate")
+	@DbField("ifnull(yr.rate,0)")
 	private Integer rate;
 }

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

@@ -20,7 +20,7 @@ import java.util.Date;
 @SearchBean(tables = "yh_shop ys left join yh_shop_user_distribute_shared us on us.shop_user_id = ys.user_id" +
 		" left join order_don od on od.yhs_id = ys.id and od.status not in ('noPayment', 'close') :time:",
 		where = "ys.verify_status = 'success'",
-		groupBy = "ys.id,ys.user_id,ys.business_id,ys.created_time,ys.update_time")
+		groupBy = "ys.id,ys.user_id,ys.business_id,ys.custom_id,ys.created_time,ys.update_time")
 public class YhShopDistributeView {
 	@DbField("ys.id")
 	private Long id;
@@ -40,6 +40,9 @@ public class YhShopDistributeView {
 	@DbField("count(yp.order_id)")
 	private Integer orders;
 
+	@DbField("ys.custom_id")
+	private String customId;
+
 	/**
 	 * 分销人数
 	 * 其中拉新用户购买一单又退款,且无后续下单动作的不算分销用户,不统计在此字段内

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

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "yh_shop_apply_record ys left user u on u.id = ys.user_id")
+@SearchBean(tables = "yh_shop_apply_record ys left join user u on u.id = ys.user_id")
 public class YhShopView {
 	@DbField("ys.id")
 	private Long id;