Merge branch 'feature-wm' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-wm

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -82,6 +82,8 @@ public enum NoticeMessageTypeEnum {
 
     MATERIAL_AUDIT_NOTIFY(6006, "素材审核通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_audit_notify", "/pages/route/index?pageType=", "hbapp_create_center", "materialAuditNotify", "haobanNotice"),
 
+    KNOWLEDGE_NEW_NOTIFY(6007, "知识库上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "knowledge_new_notify", "/pages/route/index?pageType=", "hbapp_guide_knowledge", "knowledgeNewNotify", "clerkMaterialsNotice"),
+
     CASH_APPLY_REFUSE_NOTIFY(7001,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_refuse_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyRefuseNotify","haobanNotice"),
 
     CASH_APPLY_FAIL_NOTIFY(7002,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_fail_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyFailNotify","haobanNotice"),

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

@@ -209,7 +209,7 @@ public class ContentMaterialController {
     @ResponseBody
     @RequestMapping("/get-material")
     public RestResponse<ContentMaterialInfoVO> getMaterialMember(String enterpriseId,Long contentMaterialId,String clerkId) {
-        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialMember(enterpriseId, contentMaterialId, clerkId);
+        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialMember(enterpriseId, contentMaterialId, clerkId, "");
         if (!response.isSuccess()) {
             return RestResponse.failure(response.getCode(), response.getMessage());
         }

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.qo.content;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.material.ContentMaterialRelationThirdDTO;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
 
@@ -100,6 +101,11 @@ public class ContentMaterialSaveQO {
      */
     private List<String> contentGoodsIdList;
 
+    /**
+     * 关联第三方商品id列表
+     */
+    private List<ContentMaterialRelationThirdDTO> thirdGoodsList;
+
     public Long getContentMaterialId() {
         return contentMaterialId;
     }
@@ -259,5 +265,13 @@ public class ContentMaterialSaveQO {
     public void setContentGoodsIdList(List<String> contentGoodsIdList) {
         this.contentGoodsIdList = contentGoodsIdList;
     }
+
+    public List<ContentMaterialRelationThirdDTO> getThirdGoodsList() {
+        return thirdGoodsList;
+    }
+
+    public void setThirdGoodsList(List<ContentMaterialRelationThirdDTO> thirdGoodsList) {
+        this.thirdGoodsList = thirdGoodsList;
+    }
 }
 

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.vo.content;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.additional.ContentMaterialAdditionalDTO;
 import com.gic.content.api.dto.ext.ContentMaterialExt;
 import org.apache.commons.lang3.StringUtils;
 
@@ -47,6 +48,11 @@ public class ContentMaterialInfoVO implements Serializable {
     private Integer topFlag = 0;
 
     /**
+     * 是否支持下载1是0否
+     */
+    private Integer downloadFlag;
+
+    /**
      * 发布时间
      */
     private Date publishTime;
@@ -162,6 +168,12 @@ public class ContentMaterialInfoVO implements Serializable {
      */
     private ContentMaterialExt ext;
 
+    /**
+     * 素材附件列表
+     * KEY:link链接、link_image链接小工具图片
+     */
+    private List<ContentMaterialAdditionalDTO> additionalList;
+
 
     public Long getContentMaterialId() {
         return contentMaterialId;
@@ -203,6 +215,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.topFlag = topFlag;
     }
 
+    public Integer getDownloadFlag() {
+        return downloadFlag;
+    }
+
+    public void setDownloadFlag(Integer downloadFlag) {
+        this.downloadFlag = downloadFlag;
+    }
+
     public Date getPublishTime() {
         return publishTime;
     }
@@ -395,6 +415,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.ext = ext;
     }
 
+    public List<ContentMaterialAdditionalDTO> getAdditionalList() {
+        return additionalList;
+    }
+
+    public void setAdditionalList(List<ContentMaterialAdditionalDTO> additionalList) {
+        this.additionalList = additionalList;
+    }
+
     public void convertMaterialImages(String materialImageUrls, String materialThumbnailImageUrls) {
         if (StringUtils.isNotBlank(materialImageUrls)) {
             String[] split = StringUtils.split(materialImageUrls, ",");

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

@@ -72,5 +72,15 @@ public class SimpleGoodsInfoVO implements Serializable {
      */
     private Integer sourceType;
 
+    /**
+     * 第三方商品id
+     */
+    private String thirdGoodsId;
+
+    /**
+     * 商品类型0:gic 1:微盟
+     */
+    private Integer thirdType = 0;
+
 }
 

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

@@ -55,6 +55,16 @@ public class ContentGoodsVO {
      */
     private BigDecimal minPrice;
 
+    /**
+     * 第三方商品id
+     */
+    private String thirdGoodsId;
+
+    /**
+     * 商品类型0:gic 1:微盟
+     */
+    private Integer thirdType = 0;
+
     public String getGoodsId() {
         return goodsId;
     }
@@ -126,4 +136,20 @@ public class ContentGoodsVO {
     public void setMinPrice(BigDecimal minPrice) {
         this.minPrice = minPrice;
     }
+
+    public String getThirdGoodsId() {
+        return thirdGoodsId;
+    }
+
+    public void setThirdGoodsId(String thirdGoodsId) {
+        this.thirdGoodsId = thirdGoodsId;
+    }
+
+    public Integer getThirdType() {
+        return thirdType;
+    }
+
+    public void setThirdType(Integer thirdType) {
+        this.thirdType = thirdType;
+    }
 }