fix 官网银河分销折线图

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

@@ -16,17 +16,18 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @SearchBean(tables = "distribute_waiting_send_points dw left join order_don od on od.id = dw.order_id and dw.is_vip = false" +
-		" left join vip_order_don vod on vod.id = dw.order_id and vod.is_vip = true"
+		" left join vip_order_don vod on vod.id = dw.order_id and dw.is_vip = true" +
+		" left join goods_don g on g.id = ifnull(od.goods_id,vod.goods_id)"
 		, where = ":userId: and dw.send_status not in ('not_exist','close')"
-		, groupBy = "ifnull(od.goods_id,vod.goods_id),date_format(ifnull(od.created_time,vod.created_time),'%Y-%m-%d')")
+		, groupBy = "g.id,g.title,ifnull(od.goods_id,vod.goods_id),date_format(ifnull(od.created_time,vod.created_time),'%Y-%m-%d')")
 public class PersonDistributeBrokenLineView {
-	@DbField("ifnull(od.goods_id,vod.goods_id)")
+	@DbField("g.id")
 	private Long goodsId;
 
 	/**
 	 * 平台名称
 	 */
-	@DbField("select title from goods_don where id = ifnull(od.goods_id,vod.goods_id)")
+	@DbField("g.title")
 	private String goodsTitle;
 
 	/**
@@ -38,7 +39,7 @@ public class PersonDistributeBrokenLineView {
 	/**
 	 * 当前日期订单金额
 	 */
-	@DbField("cast(sum(if(od.id is null,vod.money,if(od.is_dp and od.ori_money != 0,od.ori_money,od.money))/100 as decimal(10,2)))")
+	@DbField("cast(sum(if(od.id is null,vod.money,if(od.is_dp and od.ori_money != 0,od.ori_money,od.money))/100) as decimal(10,2))")
 	private BigDecimal money;
 
 	/**

netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -93,7 +93,8 @@
         from (select date_format(ifnull(od.created_time,vod.created_time),'%Y-%m-%d') curdate,
                      count(dw.order_id) curdateOrderCount
         from distribute_waiting_send_points dw
-        left join order_don od on od.id = dw.order_id
+        left join order_don od on od.id = dw.order_id and dw.is_vip = false
+        left join vip_order_don vod on vod.id = dw.order_id and dw.is_vip = true
         where dw.shared_id = #{userId}
           and dw.send_status not in ('not_exist', 'close')
         group by ifnull(od.goods_id,vod.goods_id), date_format(ifnull(od.created_time,vod.created_time), '%Y-%m-%d'))s