内容中心创作中心

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

@@ -80,6 +80,8 @@ public enum NoticeMessageTypeEnum {
     MATERIAL_REPORT_NOTIFY_MONTH(6004, "素材月报通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_month_notify", "/pages/route/index?pageType=", "hbapp_mate_report", "materialMonth", "clerkMaterialsReport"),
     CLERK_COMMISSION_NOTIFY(6005, "客户下单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "clerk_commission_notify", "/pages/route/index?pageType=", "hbapp_withdraw_list", "clerkCommissionNotify", "haobanNotice"),
 
+    MATERIAL_AUDIT_NOTIFY(6006, "素材审核通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_audit_notify", "/pages/route/index?pageType=", "create_center", "materialAuditNotify", "haobanNotice"),
+
     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/WxStaffController.java

@@ -1903,6 +1903,7 @@ public class WxStaffController extends WebBaseController {
         }else {
             vo.setStatus(2);
         }
+        vo.setVersion(dto.getVersion());
         return RestResponse.successResult(vo);
     }
 }

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

+package com.gic.haoban.manage.web.controller.content;
+
+import com.gic.api.base.commons.Constant;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.content.api.dto.material.ContentMaterialDTO;
+import com.gic.content.api.enums.*;
+import com.gic.content.api.qdto.material.ContentMaterialPageQDTO;
+import com.gic.content.api.qdto.material.ContentMaterialQDTO;
+import com.gic.content.api.qdto.producer.ContentProducerClerkRandomQDTO;
+import com.gic.content.api.service.ContentMaterialApiService;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.web.controller.content.adaptor.ClerkStoreAdaptor;
+import com.gic.haoban.manage.web.qo.content.ContentAuditMaterialQO;
+import com.gic.haoban.manage.web.qo.content.ContentMaterialSaveQO;
+import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialDataVO;
+import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 好办-创作中心
+ *
+ */
+@Controller
+@RequestMapping("/creative")
+public class ContentCreativeController {
+
+    private static final Logger log = LoggerFactory.getLogger(ContentCreativeController.class);
+    @Autowired
+    private ContentMaterialApiService contentMaterialApiService;
+    @Autowired
+    private ClerkService clerkService;
+    @Autowired
+    private ClerkStoreAdaptor clerkStoreAdaptor;
+
+    /**
+     * 创建素材
+     * @param saveQO
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/save-material")
+    public RestResponse<ContentMaterialDTO> saveMaterial(@Validated @RequestBody ContentMaterialSaveQO saveQO) {
+        String clerkId = saveQO.getClerkId();
+        StaffDTO staffDTO = clerkStoreAdaptor.queryStaff(clerkId);
+        if (staffDTO == null) {
+            return RestResponse.failure("-1", "成员不存在");
+        }
+        ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
+        if (clerk == null) {
+            return RestResponse.failure("-1", "导购不存在");
+        }
+        //组装导购发布人信息
+        ContentProducerClerkRandomQDTO producerQDTO = new ContentProducerClerkRandomQDTO();
+        producerQDTO.setProducerType(MaterialProducerTypeEnum.RANDOM.value);
+        producerQDTO.setNickName(clerk.getClerkName());
+        producerQDTO.setAvatar(staffDTO.getNickName());
+        producerQDTO.setEnterpriseId(saveQO.getEnterpriseId());
+        producerQDTO.setClerkId(clerkId);
+        producerQDTO.setClerkCode(clerk.getClerkCode());
+        producerQDTO.setStoreId(clerk.getStoreId());
+        ContentMaterialQDTO contentMaterialQDTO = EntityUtil.changeEntityByJSON(ContentMaterialQDTO.class, saveQO);
+        contentMaterialQDTO.setCreatorId("-1");
+        contentMaterialQDTO.setCreatorName("导购");
+        contentMaterialQDTO.setUpdaterId("-1");
+        contentMaterialQDTO.setUpdaterName("导购");
+        contentMaterialQDTO.setProducer(producerQDTO);
+        contentMaterialQDTO.setMaterialPurpose(MaterialPurposeEnum.AUDIT.code);
+        contentMaterialQDTO.setPublishType(MaterialPublishTypeEnum.NONE.value);
+        contentMaterialQDTO.setShelfStatus(Constant.FLAG_TRUE);
+        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.saveMaterial(contentMaterialQDTO);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        return RestResponse.successResult(response.getResult());
+    }
+
+    /**
+     * 删除素材
+     * @param enterpriseId  企业id
+     * @param contentMaterialId 素材id
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/delete-material")
+    public RestResponse<Void> saveMaterial(String enterpriseId, Long contentMaterialId) {
+        ServiceResponse<Void> response = contentMaterialApiService.deleteMaterial(enterpriseId, contentMaterialId);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        return RestResponse.successResult();
+    }
+
+
+    /**
+     * 素材详情
+     * @param enterpriseId 企业id
+     * @param contentMaterialId 素材id
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/detail-material")
+    public RestResponse<ContentMaterialVO> getMaterialDetail(String enterpriseId, Long contentMaterialId) {
+        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialDetail(enterpriseId, contentMaterialId);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        ContentMaterialVO detailVO = EntityUtil.changeEntityByJSON(ContentMaterialVO.class, response.getResult());
+        return RestResponse.successResult(detailVO);
+    }
+
+    /**
+     * 素材列表
+     * @param auditMaterialQO qo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/page-material")
+    public RestResponse<Page<ContentMaterialVO>> pageAuditMaterial(@RequestBody ContentAuditMaterialQO auditMaterialQO) {
+        ContentMaterialPageQDTO pageQDTO = new ContentMaterialPageQDTO();
+        pageQDTO.setEnterpriseId(auditMaterialQO.getEnterpriseId());
+        pageQDTO.setStoreId(auditMaterialQO.getStoreId());
+        pageQDTO.setClerkId(auditMaterialQO.getClerkId());
+        pageQDTO.setQueryScene(MaterialSearchSceneEnum.HAOBAN_AUDIT.value);
+        //todo 是否有转化查询
+        ServiceResponse<Page<ContentMaterialDTO>> response = contentMaterialApiService.pageMaterial(pageQDTO, auditMaterialQO.getBasePageInfo());
+        if (!response.isSuccess() || CollectionUtils.isEmpty(response.getResult().getResult())) {
+            return RestResponse.successResult(new Page<>());
+        }
+        Page<ContentMaterialDTO> page = response.getResult();
+        Page<ContentMaterialVO> result = new Page<>();
+        List<ContentMaterialVO> list = EntityUtil.changeEntityListByJSON(ContentMaterialVO.class, response.getResult().getResult());
+        result.setTotalCount(page.getTotalCount());
+        result.setResult(list);
+        result.setCurrentPage(page.getCurrentPage());
+        result.setPageSize(page.getPageSize());
+        //todo 转化数据
+        return RestResponse.successResult(result);
+    }
+
+    /**
+     * 数据概览
+     * @param auditMaterialQO  qo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/material-data")
+    public RestResponse<ContentMaterialDataVO> auditMaterialData(@RequestBody ContentAuditMaterialQO auditMaterialQO) {
+        ContentMaterialPageQDTO pageQDTO = new ContentMaterialPageQDTO();
+        pageQDTO.setEnterpriseId(auditMaterialQO.getEnterpriseId());
+        pageQDTO.setStoreId(auditMaterialQO.getStoreId());
+        pageQDTO.setClerkId(auditMaterialQO.getClerkId());
+        pageQDTO.setQueryScene(MaterialSearchSceneEnum.HAOBAN_AUDIT.value);
+        ServiceResponse<Long> response = contentMaterialApiService.countMaterialBySearch(pageQDTO);
+        pageQDTO.setAuditStatus(MaterialAuditEnum.AUDIT.code);
+        ServiceResponse<Long> auditResponse = contentMaterialApiService.countMaterialBySearch(pageQDTO);
+        if (!response.isSuccess() || !auditResponse.isSuccess()) {
+            return RestResponse.failure("-1", "请求失败");
+        }
+        ContentMaterialDataVO materialDataVO = new ContentMaterialDataVO();
+        materialDataVO.setAuditCount(auditResponse.getResult());
+        materialDataVO.setCreateCount(response.getResult());
+        //todo 转化数据
+        return RestResponse.successResult(materialDataVO);
+    }
+
+}

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

@@ -47,7 +47,7 @@ public class ContentImageController {
 
         //存储空间余额校验
         if (!accountService.storageFeeCheck(enterpriseId)){
-            return RestResponse.failure("-1", "存储空间余额不足，暂不支持视频上传，请充值");
+            return RestResponse.failure("-1", "存储余额不足，暂不支持图片/视频上传，请充值");
         }
         EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
 
@@ -76,7 +76,7 @@ public class ContentImageController {
                                           String bucketName) {
         //存储空间余额校验
         if (!accountService.storageFeeCheck(enterpriseId)){
-            return RestResponse.failure("-1", "存储空间余额不足，暂不支持图片上传，请充值");
+            return RestResponse.failure("-1", "存储余额不足，暂不支持图片/视频上传，请充值");
         }
         if (fileFlag == null){
             fileFlag = 1;

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

 package com.gic.haoban.manage.web.controller.content.adaptor;
 
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,6 +26,8 @@ public class ClerkStoreAdaptor {
 
     @Autowired
     private StaffApiService staffApiService;
+    @Autowired
+    private StaffClerkRelationApiService staffClerkRelationApiService;
 
     /**
      * 查询区经角色下管辖的门店权限
@@ -59,4 +64,13 @@ public class ClerkStoreAdaptor {
         return storeRole.getStoreCount();
     }
 
+    public StaffDTO queryStaff(String clerkId) {
+        StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationApiService.getByClerkId(clerkId);
+        if (clerkRelationDTO != null) {
+            StaffDTO staffDTO = staffApiService.selectById(clerkRelationDTO.getStaffId());
+            return staffDTO;
+        }
+        return null;
+    }
+
 }

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

+package com.gic.haoban.manage.web.qo.content;
+
+import com.gic.commons.web.qo.PageQo;
+
+public class ContentAuditMaterialQO extends PageQo {
+
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 门店id
+     */
+    private String storeId;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
+
+    /**
+     * 是否有转化 1是0否
+     */
+    private Integer convsFlag;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public Integer getConvsFlag() {
+        return convsFlag;
+    }
+
+    public void setConvsFlag(Integer convsFlag) {
+        this.convsFlag = convsFlag;
+    }
+}

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

+package com.gic.haoban.manage.web.qo.content;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+@JsonSerialize(using= ToStringSerializer.class)
+public class ContentMaterialSaveQO {
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+    /**
+     * 门店id
+     */
+    private String storeId;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
+    /**
+     * 素材名称
+     */
+    private String materialTitle;
+    /**
+     * 素材类型1图文4视频
+     */
+    @NotNull(message = "素材类型不能为空")
+    private Integer materialType;
+    /**
+     * 上架状态0未上架1已上架（默认1）
+     */
+    private Integer shelfStatus = 1;
+    /**
+     * 素材内容
+     */
+    private String materialContent;
+    /**
+     * 素材图片url列表
+     */
+    private String materialImageUrls;
+
+    /**
+     * 素材压缩后的图片url列表
+     */
+    private String materialThumbnailImageUrls;
+    /**
+     * 素材图片信息列表{width:px,height:px,size:Bytes}
+     */
+    private String materialImageInfos;
+    /**
+     * 素材视频url
+     */
+    private String materialVideoUrl;
+    /**
+     * 视频信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoInfo;
+    /**
+     * 素材视频封面url
+     */
+    private String materialVideoImageUrl;
+
+    /**
+     * 视频封面信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoImageInfo;
+    /**
+     * 素材视频第一帧url
+     */
+    private String materialVideoFirstImageUrl;
+
+    /**
+     * 视频第一帧信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoFirstImageInfo;
+    /**
+     * 视频时长
+     */
+    private Integer duration;
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 企微id
+     */
+    private String wxEnterpriseId;
+
+    /**
+     * 关联商品id列表
+     */
+    private List<String> contentGoodsIdList;
+
+    public Long getContentMaterialId() {
+        return contentMaterialId;
+    }
+
+    public void setContentMaterialId(Long contentMaterialId) {
+        this.contentMaterialId = contentMaterialId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getMaterialTitle() {
+        return materialTitle;
+    }
+
+    public void setMaterialTitle(String materialTitle) {
+        this.materialTitle = materialTitle;
+    }
+
+    public Integer getMaterialType() {
+        return materialType;
+    }
+
+    public void setMaterialType(Integer materialType) {
+        this.materialType = materialType;
+    }
+
+    public Integer getShelfStatus() {
+        return shelfStatus;
+    }
+
+    public void setShelfStatus(Integer shelfStatus) {
+        this.shelfStatus = shelfStatus;
+    }
+
+    public String getMaterialContent() {
+        return materialContent;
+    }
+
+    public void setMaterialContent(String materialContent) {
+        this.materialContent = materialContent;
+    }
+
+    public String getMaterialImageUrls() {
+        return materialImageUrls;
+    }
+
+    public void setMaterialImageUrls(String materialImageUrls) {
+        this.materialImageUrls = materialImageUrls;
+    }
+
+    public String getMaterialThumbnailImageUrls() {
+        return materialThumbnailImageUrls;
+    }
+
+    public void setMaterialThumbnailImageUrls(String materialThumbnailImageUrls) {
+        this.materialThumbnailImageUrls = materialThumbnailImageUrls;
+    }
+
+    public String getMaterialImageInfos() {
+        return materialImageInfos;
+    }
+
+    public void setMaterialImageInfos(String materialImageInfos) {
+        this.materialImageInfos = materialImageInfos;
+    }
+
+    public String getMaterialVideoUrl() {
+        return materialVideoUrl;
+    }
+
+    public void setMaterialVideoUrl(String materialVideoUrl) {
+        this.materialVideoUrl = materialVideoUrl;
+    }
+
+    public String getMaterialVideoInfo() {
+        return materialVideoInfo;
+    }
+
+    public void setMaterialVideoInfo(String materialVideoInfo) {
+        this.materialVideoInfo = materialVideoInfo;
+    }
+
+    public String getMaterialVideoImageUrl() {
+        return materialVideoImageUrl;
+    }
+
+    public void setMaterialVideoImageUrl(String materialVideoImageUrl) {
+        this.materialVideoImageUrl = materialVideoImageUrl;
+    }
+
+    public String getMaterialVideoImageInfo() {
+        return materialVideoImageInfo;
+    }
+
+    public void setMaterialVideoImageInfo(String materialVideoImageInfo) {
+        this.materialVideoImageInfo = materialVideoImageInfo;
+    }
+
+    public String getMaterialVideoFirstImageUrl() {
+        return materialVideoFirstImageUrl;
+    }
+
+    public void setMaterialVideoFirstImageUrl(String materialVideoFirstImageUrl) {
+        this.materialVideoFirstImageUrl = materialVideoFirstImageUrl;
+    }
+
+    public String getMaterialVideoFirstImageInfo() {
+        return materialVideoFirstImageInfo;
+    }
+
+    public void setMaterialVideoFirstImageInfo(String materialVideoFirstImageInfo) {
+        this.materialVideoFirstImageInfo = materialVideoFirstImageInfo;
+    }
+
+    public Integer getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Integer duration) {
+        this.duration = duration;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public List<String> getContentGoodsIdList() {
+        return contentGoodsIdList;
+    }
+
+    public void setContentGoodsIdList(List<String> contentGoodsIdList) {
+        this.contentGoodsIdList = contentGoodsIdList;
+    }
+}
+

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

@@ -12,6 +12,11 @@ public class RightVO implements Serializable{
     // 0未购买 1正常 2已过期  
     private int status ;
 
+    /**
+     * 版本 1基础版2高级版
+     */
+    private Integer version;
+
     public int getStatus() {
         return status;
     }
@@ -19,4 +24,12 @@ public class RightVO implements Serializable{
     public void setStatus(int status) {
         this.status = status;
     }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
 }

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

@@ -53,21 +53,37 @@ public class ContentMaterialInfoVO implements Serializable {
     private List<String> materialThumbnailImageUrls;
 
     /**
-     * 素材视频链接
+     * 素材图片信息列表{width:px,height:px,size:Bytes}
+     */
+    private String materialImageInfos;
+    /**
+     * 素材视频url
      */
     private String materialVideoUrl;
-
     /**
-     * 素材视频封面链接
+     * 视频信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoInfo;
+    /**
+     * 素材视频封面url
      */
     private String materialVideoImageUrl;
 
     /**
+     * 视频封面信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoImageInfo;
+    /**
      * 素材视频第一帧url
      */
     private String materialVideoFirstImageUrl;
 
     /**
+     * 视频第一帧信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoFirstImageInfo;
+
+    /**
      * 分享次数
      */
     private Long shareCount;
@@ -241,4 +257,36 @@ public class ContentMaterialInfoVO implements Serializable {
     public void setSourceType(Integer sourceType) {
         this.sourceType = sourceType;
     }
+
+    public String getMaterialImageInfos() {
+        return materialImageInfos;
+    }
+
+    public void setMaterialImageInfos(String materialImageInfos) {
+        this.materialImageInfos = materialImageInfos;
+    }
+
+    public String getMaterialVideoInfo() {
+        return materialVideoInfo;
+    }
+
+    public void setMaterialVideoInfo(String materialVideoInfo) {
+        this.materialVideoInfo = materialVideoInfo;
+    }
+
+    public String getMaterialVideoImageInfo() {
+        return materialVideoImageInfo;
+    }
+
+    public void setMaterialVideoImageInfo(String materialVideoImageInfo) {
+        this.materialVideoImageInfo = materialVideoImageInfo;
+    }
+
+    public String getMaterialVideoFirstImageInfo() {
+        return materialVideoFirstImageInfo;
+    }
+
+    public void setMaterialVideoFirstImageInfo(String materialVideoFirstImageInfo) {
+        this.materialVideoFirstImageInfo = materialVideoFirstImageInfo;
+    }
 }

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

+package com.gic.haoban.manage.web.vo.content.creative;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ContentAuditorVO implements Serializable {
+
+    /**
+     * 审核人id
+     */
+    private String auditorId;
+
+    /**
+     * 审核人名称
+     */
+    private String auditorName;
+
+    /**
+     * 审核时间
+     */
+    private Date auditorTime;
+
+    /**
+     * 审核备注
+     */
+    private String remark;
+
+    public String getAuditorId() {
+        return auditorId;
+    }
+
+    public void setAuditorId(String auditorId) {
+        this.auditorId = auditorId;
+    }
+
+    public String getAuditorName() {
+        return auditorName;
+    }
+
+    public void setAuditorName(String auditorName) {
+        this.auditorName = auditorName;
+    }
+
+    public Date getAuditorTime() {
+        return auditorTime;
+    }
+
+    public void setAuditorTime(Date auditorTime) {
+        this.auditorTime = auditorTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.content.creative;
+
+
+/**
+ * 内容分类表(TabContentCategory)表实体类
+ *
+ * @author makejava
+ * @since 2022-10-27 17:20:20
+ */
+@SuppressWarnings("serial")
+public class ContentGoodsVO {
+    /**
+     * 商品id
+     */
+    private String goodsId;
+
+    /**
+     * 商品Code
+     */
+    private String goodsCode;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 商品主图
+     */
+    private String goodsImageUrl;
+
+    /**
+     * spu库存
+     */
+    private Integer spuStock;
+
+    /**
+     * 商品状态
+     * @see com.gic.store.goods.enums.GoodsStatusEnum
+     */
+    private Integer status;
+
+    /**
+     * 是否已完善1是0否
+     */
+    private Integer isComplete;
+
+    /**
+     * 商品金额
+     */
+    private Double proPrice;
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getGoodsImageUrl() {
+        return goodsImageUrl;
+    }
+
+    public void setGoodsImageUrl(String goodsImageUrl) {
+        this.goodsImageUrl = goodsImageUrl;
+    }
+
+    public Integer getSpuStock() {
+        return spuStock;
+    }
+
+    public void setSpuStock(Integer spuStock) {
+        this.spuStock = spuStock;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getIsComplete() {
+        return isComplete;
+    }
+
+    public void setIsComplete(Integer isComplete) {
+        this.isComplete = isComplete;
+    }
+
+    public Double getProPrice() {
+        return proPrice;
+    }
+
+    public void setProPrice(Double proPrice) {
+        this.proPrice = proPrice;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.content.creative;
+
+import java.io.Serializable;
+
+public class ContentMaterialConvsVO implements Serializable {
+
+    /**
+     * 转化人数
+     */
+    private Integer convsNum;
+
+    /**
+     * 转化金额
+     */
+    private Double convsAmt;
+
+    public Integer getConvsNum() {
+        return convsNum;
+    }
+
+    public void setConvsNum(Integer convsNum) {
+        this.convsNum = convsNum;
+    }
+
+    public Double getConvsAmt() {
+        return convsAmt;
+    }
+
+    public void setConvsAmt(Double convsAmt) {
+        this.convsAmt = convsAmt;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.content.creative;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ContentMaterialDataVO implements Serializable {
+
+    /**
+     * 创建数
+     */
+    private Long createCount;
+
+    /**
+     * 待审核数
+     */
+    private Long auditCount;
+
+    /**
+     * 转化人数
+     */
+    private Integer convsNum;
+
+    /**
+     * 转化金额
+     */
+    private Double convsAmt;
+
+    public Long getCreateCount() {
+        return createCount;
+    }
+
+    public void setCreateCount(Long createCount) {
+        this.createCount = createCount;
+    }
+
+    public Long getAuditCount() {
+        return auditCount;
+    }
+
+    public void setAuditCount(Long auditCount) {
+        this.auditCount = auditCount;
+    }
+
+    public Integer getConvsNum() {
+        return convsNum;
+    }
+
+    public void setConvsNum(Integer convsNum) {
+        this.convsNum = convsNum;
+    }
+
+    public Double getConvsAmt() {
+        return convsAmt;
+    }
+
+    public void setConvsAmt(Double convsAmt) {
+        this.convsAmt = convsAmt;
+    }
+}

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

+package com.gic.haoban.manage.web.vo.content.creative;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
+import java.util.List;
+
+public class ContentMaterialVO {
+    /**
+     * 素材id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long contentMaterialId;
+    /**
+     * 素材用途0无（未审核）1营销2社区
+     */
+    private Integer materialPurpose;
+
+    /**
+     * 素材名称
+     */
+    private String materialTitle;
+    /**
+     * 素材类型1图文4视频
+     */
+    private Integer materialType;
+    /**
+     * 1企业/品牌方2导购
+     */
+    private Integer materialSource;
+    /**
+     * 上架状态0未上架1已上架
+     */
+    private Integer shelfStatus;
+    /**
+     * 素材内容
+     */
+    private String materialContent;
+    /**
+     * 素材图片url列表
+     */
+    private String materialImageUrls;
+
+    /**
+     * 素材压缩后的图片url列表
+     */
+    private String materialThumbnailImageUrls;
+
+    /**
+     * 素材图片信息列表{width:px,height:px,size:Bytes}
+     */
+    private String materialImageInfos;
+    /**
+     * 素材视频url
+     */
+    private String materialVideoUrl;
+    /**
+     * 视频信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoInfo;
+    /**
+     * 素材视频封面url
+     */
+    private String materialVideoImageUrl;
+
+    /**
+     * 视频封面信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoImageInfo;
+    /**
+     * 素材视频第一帧url
+     */
+    private String materialVideoFirstImageUrl;
+
+    /**
+     * 视频第一帧信息{width:px,height:px,size:Bytes}
+     */
+    private String materialVideoFirstImageInfo;
+    /**
+     * 视频时长
+     */
+    private Integer duration;
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 关联商品列表
+     */
+    private List<ContentGoodsVO> contentGoodsList;
+
+    /**
+     * 审核状态0待审核1未通过2已通过
+     */
+    private Integer auditStatus;
+    /**
+     * 审核信息
+     */
+    private ContentAuditorVO auditor;
+
+    public Long getContentMaterialId() {
+        return contentMaterialId;
+    }
+
+    public void setContentMaterialId(Long contentMaterialId) {
+        this.contentMaterialId = contentMaterialId;
+    }
+
+    public Integer getMaterialPurpose() {
+        return materialPurpose;
+    }
+
+    public void setMaterialPurpose(Integer materialPurpose) {
+        this.materialPurpose = materialPurpose;
+    }
+
+    public String getMaterialTitle() {
+        return materialTitle;
+    }
+
+    public void setMaterialTitle(String materialTitle) {
+        this.materialTitle = materialTitle;
+    }
+
+    public Integer getMaterialType() {
+        return materialType;
+    }
+
+    public void setMaterialType(Integer materialType) {
+        this.materialType = materialType;
+    }
+
+    public Integer getMaterialSource() {
+        return materialSource;
+    }
+
+    public void setMaterialSource(Integer materialSource) {
+        this.materialSource = materialSource;
+    }
+
+    public Integer getShelfStatus() {
+        return shelfStatus;
+    }
+
+    public void setShelfStatus(Integer shelfStatus) {
+        this.shelfStatus = shelfStatus;
+    }
+
+    public String getMaterialContent() {
+        return materialContent;
+    }
+
+    public void setMaterialContent(String materialContent) {
+        this.materialContent = materialContent;
+    }
+
+    public String getMaterialImageUrls() {
+        return materialImageUrls;
+    }
+
+    public void setMaterialImageUrls(String materialImageUrls) {
+        this.materialImageUrls = materialImageUrls;
+    }
+
+    public String getMaterialThumbnailImageUrls() {
+        return materialThumbnailImageUrls;
+    }
+
+    public void setMaterialThumbnailImageUrls(String materialThumbnailImageUrls) {
+        this.materialThumbnailImageUrls = materialThumbnailImageUrls;
+    }
+
+    public String getMaterialImageInfos() {
+        return materialImageInfos;
+    }
+
+    public void setMaterialImageInfos(String materialImageInfos) {
+        this.materialImageInfos = materialImageInfos;
+    }
+
+    public String getMaterialVideoUrl() {
+        return materialVideoUrl;
+    }
+
+    public void setMaterialVideoUrl(String materialVideoUrl) {
+        this.materialVideoUrl = materialVideoUrl;
+    }
+
+    public String getMaterialVideoInfo() {
+        return materialVideoInfo;
+    }
+
+    public void setMaterialVideoInfo(String materialVideoInfo) {
+        this.materialVideoInfo = materialVideoInfo;
+    }
+
+    public String getMaterialVideoImageUrl() {
+        return materialVideoImageUrl;
+    }
+
+    public void setMaterialVideoImageUrl(String materialVideoImageUrl) {
+        this.materialVideoImageUrl = materialVideoImageUrl;
+    }
+
+    public String getMaterialVideoImageInfo() {
+        return materialVideoImageInfo;
+    }
+
+    public void setMaterialVideoImageInfo(String materialVideoImageInfo) {
+        this.materialVideoImageInfo = materialVideoImageInfo;
+    }
+
+    public String getMaterialVideoFirstImageUrl() {
+        return materialVideoFirstImageUrl;
+    }
+
+    public void setMaterialVideoFirstImageUrl(String materialVideoFirstImageUrl) {
+        this.materialVideoFirstImageUrl = materialVideoFirstImageUrl;
+    }
+
+    public String getMaterialVideoFirstImageInfo() {
+        return materialVideoFirstImageInfo;
+    }
+
+    public void setMaterialVideoFirstImageInfo(String materialVideoFirstImageInfo) {
+        this.materialVideoFirstImageInfo = materialVideoFirstImageInfo;
+    }
+
+    public Integer getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Integer duration) {
+        this.duration = duration;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public List<ContentGoodsVO> getContentGoodsList() {
+        return contentGoodsList;
+    }
+
+    public void setContentGoodsList(List<ContentGoodsVO> contentGoodsList) {
+        this.contentGoodsList = contentGoodsList;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public ContentAuditorVO getAuditor() {
+        return auditor;
+    }
+
+    public void setAuditor(ContentAuditorVO auditor) {
+        this.auditor = auditor;
+    }
+
+}
+

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -71,7 +71,7 @@
     <dubbo:reference interface="com.gic.haoban.app.customer.service.api.service.StaffMemberRelationApiService"
                      id="staffMemberRelationApiService"/>
 
-    <dubbo:reference interface="com.gic.haoban.manage.api.service.MaterialApiService" id="materialApiService"/>
+    <dubbo:reference interface="com.gic.haoban.manage.api.service.MaterialApiService" id="materialApiService" url="dubbo://172.16.30.206:22310"/>
 
     <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService"/>