|
@@ -21,7 +21,7 @@ import java.util.Date;
|
|
|
@SearchBean(tables = "(select id,name,remark,code,created_time from user_distribute_popularize where deleted is true :userId:) dp left join order_don od on od.cps_popularize_id = dp.id" +
|
|
@SearchBean(tables = "(select id,name,remark,code,created_time from user_distribute_popularize where deleted is true :userId:) dp left join order_don od on od.cps_popularize_id = dp.id" +
|
|
|
" and od.status not in ('close','noPayment') and od.relation_id != 0 and is_fixed_distribute is true" +
|
|
" and od.status not in ('close','noPayment') and od.relation_id != 0 and is_fixed_distribute is true" +
|
|
|
" left join distribute_waiting_send_points dsp on dsp.order_id = od.id and dsp.send_status in ('success','waiting')",
|
|
" left join distribute_waiting_send_points dsp on dsp.order_id = od.id and dsp.send_status in ('success','waiting')",
|
|
|
- groupBy = "dp.id,dp.name,dp.code,dp.remark,dp.created_time")
|
|
|
|
|
|
|
+ groupBy = "dp.id,dp.name,dp.code,dp.remark,dp.created_time,dp.goods_id")
|
|
|
public class UserDistributePopularizeView {
|
|
public class UserDistributePopularizeView {
|
|
|
@DbField("dp.id")
|
|
@DbField("dp.id")
|
|
|
private Long id;
|
|
private Long id;
|
|
@@ -33,6 +33,9 @@ public class UserDistributePopularizeView {
|
|
|
@JsonIgnore
|
|
@JsonIgnore
|
|
|
private String code;
|
|
private String code;
|
|
|
|
|
|
|
|
|
|
+ @DbField("dp.goods_id")
|
|
|
|
|
+ private String goodsId;
|
|
|
|
|
+
|
|
|
@DbIgnore
|
|
@DbIgnore
|
|
|
private String popularizeLink;
|
|
private String popularizeLink;
|
|
|
|
|
|