fix 分销之前用户的订单过滤

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

@@ -18,7 +18,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "order_don od left join goods_don gd on gd.id = od.goods_id")
+@SearchBean(tables = "order_don od left join goods_don gd on gd.id = od.goods_id",
+		where = "od.is_fixed_distribute is true")
 public class RegisterDistributeOrdersDetailView {
 
 	@DbField("od.created_time")

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

@@ -10,6 +10,7 @@
                  inner join `distribute_waiting_send_points` dp
                             on dp.order_id = od.id
         where us.shared_id = #{userId}
+          and od.is_fixed_distribute is true
           and od.status not in ('close', 'noPayment')
     </select>
 
@@ -22,6 +23,7 @@
     <select id="getHasPayOrdersBySharedId" resultType="java.math.BigDecimal">
         select ifnull(sum(od.money),0) from `user_distribute_shared` us left join `order_don` od on od.user_id = us.user_id
         where us.shared_id = #{userId}
+        and is_fixed_distribute is true
         and od.status not in
         <foreach collection="noOrderStatus" item="item" open="(" separator="," close=")">
             #{item}
@@ -31,6 +33,7 @@
     <select id="countHasPayBySharedId" resultType="java.math.BigDecimal">
         select count(distinct od.user_id) from `user_distribute_shared` us left join `order_don` od on od.user_id = us.user_id
         where us.shared_id = #{userId}
+        and is_fixed_distribute is true
         and od.status not in
         <foreach collection="noOrderStatus" item="item" open="(" separator="," close=")">
             #{item}