zoujiajian il y a 2 ans
Parent
commit
b39dfeff5a

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/UserDistributePopularize.java

@@ -1,5 +1,7 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,6 +23,9 @@ public class UserDistributePopularize extends BaseEntity{
 
 	private String code;
 
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long goodsId;
+
 	private String remark;
 
 	private Boolean deleted;

+ 4 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserDistributePopularizeView.java

@@ -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" +
 		" 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')",
-		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 {
 	@DbField("dp.id")
 	private Long id;
@@ -33,6 +33,9 @@ public class UserDistributePopularizeView {
 	@JsonIgnore
 	private String code;
 
+	@DbField("dp.goods_id")
+	private String goodsId;
+
 	@DbIgnore
 	private String popularizeLink;