|
@@ -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" +
|
|
@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:",
|
|
" left join order_don od on od.yhs_id = ys.id and od.status not in ('noPayment', 'close') :time:",
|
|
|
where = "ys.verify_status = 'success'",
|
|
where = "ys.verify_status = 'success'",
|
|
|
- groupBy = "ys.id,ys.user_id,ys.business_id,ys.custom_id,ys.created_time,ys.update_time")
|
|
|
|
|
|
|
+ groupBy = "ys.id,ys.user_id,ys.business_id,ys.custom_id,ys.status,ys.remark,ys.created_time,ys.update_time")
|
|
|
public class YhShopDistributeView {
|
|
public class YhShopDistributeView {
|
|
|
@DbField("ys.id")
|
|
@DbField("ys.id")
|
|
|
private Long id;
|
|
private Long id;
|
|
@@ -74,6 +74,12 @@ public class YhShopDistributeView {
|
|
|
@DbIgnore
|
|
@DbIgnore
|
|
|
private String goodsTitle;
|
|
private String goodsTitle;
|
|
|
|
|
|
|
|
|
|
+ @DbField("ys.status")
|
|
|
|
|
+ private Boolean status;
|
|
|
|
|
+
|
|
|
|
|
+ @DbField("ys.remark")
|
|
|
|
|
+ private String remark;
|
|
|
|
|
+
|
|
|
@DbField("ys.created_time")
|
|
@DbField("ys.created_time")
|
|
|
private Date createdTime;
|
|
private Date createdTime;
|
|
|
|
|
|