Merge branch 'feature-content7' into 'master'

Feature content7

See merge request !1683

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/content/log/ClerkShareMaterialLogDTO.java

@@ -60,6 +60,11 @@ public class ClerkShareMaterialLogDTO implements Serializable {
      */
     private String externalUserId;
 
+    /**
+     * 额外数据
+     */
+    private String extend;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -131,4 +136,12 @@ public class ClerkShareMaterialLogDTO implements Serializable {
     public void setExternalUserId(String externalUserId) {
         this.externalUserId = externalUserId;
     }
+
+    public String getExtend() {
+        return extend;
+    }
+
+    public void setExtend(String extend) {
+        this.extend = extend;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/content/TabHaobanClerkShareLog.java

@@ -63,5 +63,10 @@ public class TabHaobanClerkShareLog implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+
+    /**
+     * 额外数据
+     */
+    private String extend;
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/content/ClerkShareLogBO.java

@@ -56,6 +56,11 @@ public class ClerkShareLogBO {
 
     private String storeId;
 
+    /**
+     * 额外数据
+     */
+    private String extend;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -135,4 +140,12 @@ public class ClerkShareLogBO {
     public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
+
+    public String getExtend() {
+        return extend;
+    }
+
+    public void setExtend(String extend) {
+        this.extend = extend;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ClerkMaterialShareController.java

@@ -6,14 +6,17 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.content.api.dto.material.ContentGoodsDTO;
 import com.gic.content.api.dto.material.ContentMaterialLandingPageInfoDTO;
+import com.gic.content.api.dto.material.MaterialLinkDTO;
 import com.gic.content.api.dto.material.ProductInfoDTO;
 import com.gic.content.api.qdto.material.ContentMaterialLandingPageQDTO;
+import com.gic.content.api.qdto.share.MaterialLinkShareQDTO;
 import com.gic.content.api.service.ContentMaterialShareApiService;
 import com.gic.haoban.manage.api.dto.content.log.ClerkShareMaterialLogDTO;
 import com.gic.haoban.manage.api.enums.content.ShareBizType;
 import com.gic.haoban.manage.api.service.content.MaterialShareLogApiService;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialBaseQO;
 import com.gic.haoban.manage.web.qo.content.log.MaterialShareLogQO;
+import com.gic.haoban.manage.web.qo.content.share.ContentLinkShareQO;
 import com.gic.haoban.manage.web.vo.content.ContentMaterialInfoVO;
 import com.gic.haoban.manage.web.vo.content.SimpleGoodsInfoVO;
 import com.gic.haoban.manage.web.vo.content.share.ContentMaterialLandingPageVO;
@@ -67,6 +70,7 @@ public class ClerkMaterialShareController {
         temp.setBizType(ShareBizType.MATERIAL.getCode());
         temp.setStoreId(materialShareLogQo.getStoreId());
         temp.setExternalUserId(materialShareLogQo.getExternalUserId());
+        temp.setExtend(materialShareLogQo.getExtend());
         ServiceResponse<Long> serviceResponse = materialShareLogApiService.saveClerkShareMaterialLog(temp);
         if (serviceResponse.isSuccess()) {
             return RestResponse.successResult(serviceResponse.getResult());
@@ -119,4 +123,26 @@ public class ClerkMaterialShareController {
         }
         return RestResponse.successResult(materialLandingPageVO);
     }
+
+    /**
+     * 生成素材外链跳转地址
+     * @param materialBaseQO
+     * @return
+     */
+    @RequestMapping(path = "/clerk/share-material-link", method = RequestMethod.POST)
+    public RestResponse<MaterialLinkDTO> clerkShareMaterialLink(@RequestBody ContentLinkShareQO linkShareQO) {
+        MaterialLinkShareQDTO linkShareQDTO = new MaterialLinkShareQDTO();
+        linkShareQDTO.setClerkId(linkShareQO.getClerkId());
+        linkShareQDTO.setStoreId(linkShareQO.getStoreId());
+        linkShareQDTO.setContentMaterialId(linkShareQO.getContentMaterialId());
+        linkShareQDTO.setEnterpriseId(linkShareQO.getEnterpriseId());
+        linkShareQDTO.setClerkType(linkShareQO.getClerkType());
+        linkShareQDTO.setChannelSource(linkShareQO.getChannelSource());
+        ServiceResponse<MaterialLinkDTO> response = contentMaterialShareApiService.generateLink(linkShareQDTO);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        return RestResponse.successResult(response.getResult());
+    }
+
 }

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

@@ -24,6 +24,11 @@ public class MaterialShareLogQO extends ContentMaterialBaseQO {
      */
     private String externalUserId;
 
+    /**
+     * 额外数据
+     */
+    private String extend;
+
     public Integer getShareType() {
         return shareType;
     }
@@ -39,4 +44,12 @@ public class MaterialShareLogQO extends ContentMaterialBaseQO {
     public void setExternalUserId(String externalUserId) {
         this.externalUserId = externalUserId;
     }
+
+    public String getExtend() {
+        return extend;
+    }
+
+    public void setExtend(String extend) {
+        this.extend = extend;
+    }
 }

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

+package com.gic.haoban.manage.web.qo.content.share;
+
+import com.gic.haoban.manage.web.qo.content.ContentMaterialBaseQO;
+
+/**
+ * Created by wangzubo on 2024/3/4.
+ */
+public class ContentLinkShareQO extends ContentMaterialBaseQO {
+
+    /**
+     * 导购类型 2区经督导 其他导购
+     */
+    private Integer clerkType;
+
+    /**
+     * 渠道来源 1朋友圈2客户群3对话框 其他
+     */
+    private Integer channelSource;
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
+
+    public Integer getChannelSource() {
+        return channelSource;
+    }
+
+    public void setChannelSource(Integer channelSource) {
+        this.channelSource = channelSource;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -33,6 +33,11 @@ public class ContentMaterialInfoVO implements Serializable {
     private String materialTitle;
 
     /**
+     * 素材子标题
+     */
+    private String materialSubTitle;
+
+    /**
      * 素材内容
      */
     private String materialContent;
@@ -43,6 +48,16 @@ public class ContentMaterialInfoVO implements Serializable {
     private Integer materialType;
 
     /**
+     * 发布状态
+     *   a. 待发布：未到发布开始时间
+     *   b. 已发布：超过发布开始时间且「无发布结束时间or未到发布结束时间」
+     *   c. 已结束：超过发布结束时间
+     *   d. 不发布：设置了暂不发布的素材
+     * @see com.gic.content.api.enums.MaterialPublishStatusSearchEnum
+     */
+    private Integer publishStatus;
+
+    /**
      * 是否置顶0不置顶1置顶
      */
     private Integer topFlag = 0;
@@ -115,6 +130,12 @@ public class ContentMaterialInfoVO implements Serializable {
      */
     private String materialFileInfo;
 
+
+    /**
+     * 素材外链
+     */
+    private String materialLink;
+
     /**
      * 分享次数
      */
@@ -190,6 +211,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialTitle = materialTitle;
     }
 
+    public String getMaterialSubTitle() {
+        return materialSubTitle;
+    }
+
+    public void setMaterialSubTitle(String materialSubTitle) {
+        this.materialSubTitle = materialSubTitle;
+    }
+
     public String getMaterialContent() {
         return materialContent;
     }
@@ -206,6 +235,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialType = materialType;
     }
 
+    public Integer getPublishStatus() {
+        return publishStatus;
+    }
+
+    public void setPublishStatus(Integer publishStatus) {
+        this.publishStatus = publishStatus;
+    }
+
     public Integer getTopFlag() {
         return topFlag;
     }
@@ -390,6 +427,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialVideoFirstImageInfo = materialVideoFirstImageInfo;
     }
 
+    public String getMaterialLink() {
+        return materialLink;
+    }
+
+    public void setMaterialLink(String materialLink) {
+        this.materialLink = materialLink;
+    }
+
     public Long getLikeCount() {
         return likeCount;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/creative/ContentMaterialVO.java

@@ -23,6 +23,19 @@ public class ContentMaterialVO extends ContentMaterialConvsVO{
      */
     private String materialTitle;
     /**
+     * 素材子标题
+     */
+    private String materialSubTitle;
+    /**
+     * 发布状态
+     *   a. 待发布：未到发布开始时间
+     *   b. 已发布：超过发布开始时间且「无发布结束时间or未到发布结束时间」
+     *   c. 已结束：超过发布结束时间
+     *   d. 不发布：设置了暂不发布的素材
+     * @see com.gic.content.api.enums.MaterialPublishStatusSearchEnum
+     */
+    private Integer publishStatus;
+    /**
      * 素材类型1图文4视频
      */
     private Integer materialType;
@@ -140,6 +153,14 @@ public class ContentMaterialVO extends ContentMaterialConvsVO{
         this.materialTitle = materialTitle;
     }
 
+    public String getMaterialSubTitle() {
+        return materialSubTitle;
+    }
+
+    public void setMaterialSubTitle(String materialSubTitle) {
+        this.materialSubTitle = materialSubTitle;
+    }
+
     public Integer getMaterialType() {
         return materialType;
     }
@@ -308,5 +329,12 @@ public class ContentMaterialVO extends ContentMaterialConvsVO{
         this.auditor = auditor;
     }
 
+    public Integer getPublishStatus() {
+        return publishStatus;
+    }
+
+    public void setPublishStatus(Integer publishStatus) {
+        this.publishStatus = publishStatus;
+    }
 }