|
|
@@ -20,7 +20,7 @@ import java.util.Date;
|
|
|
@SearchBean(tables = "user_distribute ud left join user_distribute_shared us on ud.user_id = us.shared_id" +
|
|
|
" left join order_don od on od.user_id = us.user_id and od.is_fixed_distribute = 1 and od.status not in ('noPayment', 'close') and od.relation_id != 0 :time:",
|
|
|
where = "ud.deleted is true",
|
|
|
- groupBy = "ud.id,ud.user_id,ud.business_id,ud.remark,ud.created_time,ud.update_time")
|
|
|
+ groupBy = "ud.id,ud.user_id,ud.business_id,ud.remark,ud.created_time,ud.update_time,ud.business_bind_time")
|
|
|
public class UserDistributeViews {
|
|
|
|
|
|
@DbField("ud.id")
|
|
|
@@ -57,10 +57,13 @@ public class UserDistributeViews {
|
|
|
@DbField("count(DISTINCT us.user_id)")
|
|
|
private Integer inviteNum;
|
|
|
|
|
|
+ @DbField("ud.business_bind_time")
|
|
|
+ private Date businessBindTime;
|
|
|
+
|
|
|
/**
|
|
|
* 分销订单金额(无需产生积分)
|
|
|
*/
|
|
|
- @DbField(value = "ifnull(sum(od.money),0) - ifnull(sum(od.refund_money),0)")
|
|
|
+ @DbField("(ifnull(sum(od.money),0) - ifnull(sum(od.refund_money),0))")
|
|
|
private BigDecimal distributeOrdersMoney;
|
|
|
|
|
|
/**
|
zoujiajian