Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !2998

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -155,9 +155,11 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         plan.setBeginDate(plan.getPublishTime());
         Date endTime = DateUtil.getEndTimeOfDay(DateUtil.addDay(plan.getBeginDate(), plan.getExpireDays()));
         plan.setEndDate(endTime);
-        if(null == planId) {
+        if(null == planId || null == this.qwMomentPlanMapper.getById(planId)) {
             createFlag = true ;
-            planId = UniqueIdUtils.uniqueLong();
+            if(null == planId) {
+                planId = UniqueIdUtils.uniqueLong();
+            }
             dto.setPlanId(planId);
             plan.setPlanId(planId);
             plan.setCreateTime(now);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialShareQO.java

@@ -71,6 +71,29 @@ public class ContentMaterialShareQO implements Serializable {
     // 营销时间（任务创建时间)
     private String marketingTime ;
 
+
+    // 1朋友圈
+    private int planType ;
+
+    // 生成素材的活动id
+    private String planId ;
+
+    public int getPlanType() {
+        return planType;
+    }
+
+    public void setPlanType(int planType) {
+        this.planType = planType;
+    }
+
+    public String getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(String planId) {
+        this.planId = planId;
+    }
+
     public Long getCanvasId() {
         return canvasId;
     }