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

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

@@ -3,6 +3,8 @@ package com.gic.haoban.manage.web.controller.content;
 import com.gic.api.base.commons.BasePageInfo;
 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.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -53,6 +55,8 @@ public class ContentAIController {
     @Autowired
     private EnterpriseService enterpriseService;
     @Autowired
+    private ClerkService clerkService;
+    @Autowired
     private ValueAddedServicesOrderApiService valueAddedServicesOrderApiService;
 
     /**
@@ -153,20 +157,28 @@ public class ContentAIController {
     @ResponseBody
     public RestResponse<String> exportVideo(@RequestBody CmeExportVideoQO cmeExportVideo){
         String enterpriseId = cmeExportVideo.getEnterpriseId();
+        String clerkId = cmeExportVideo.getClerkId();
+        ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+        if (clerkDTO == null) {
+            return RestResponse.failure("-1", "导购不存在");
+        }
         EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
         String factoryCode = enterpriseDTO.getFactoryCode();
         ContentExportVideoQDTO exportVideoQDTO = new ContentExportVideoQDTO();
         exportVideoQDTO.setEnterpriseId(cmeExportVideo.getEnterpriseId());
         exportVideoQDTO.setContentTemplateId(cmeExportVideo.getContentTemplateId());
-        exportVideoQDTO.setStoreId(cmeExportVideo.getStoreId());
-        exportVideoQDTO.setStoreCode(cmeExportVideo.getStoreCode());
-        exportVideoQDTO.setStoreName(cmeExportVideo.getStoreName());
+        exportVideoQDTO.setStoreId(clerkDTO.getStoreId());
+        exportVideoQDTO.setStoreCode(clerkDTO.getStoreCode());
+        exportVideoQDTO.setStoreName(clerkDTO.getStoreName());
         exportVideoQDTO.setUserId(cmeExportVideo.getClerkId());
-        exportVideoQDTO.setUserCode(cmeExportVideo.getClerkCode());
-        exportVideoQDTO.setUserName(cmeExportVideo.getClerkName());
+        exportVideoQDTO.setUserCode(clerkDTO.getClerkCode());
+        exportVideoQDTO.setUserName(clerkDTO.getClerkName());
         exportVideoQDTO.setName(cmeExportVideo.getName());
         CmeExportVideoQDTO cmeExportVideoQDTO = EntityUtil.changeEntityByJSON(CmeExportVideoQDTO.class, cmeExportVideo);
         cmeExportVideoQDTO.setFactoryCode(factoryCode);
+        CmeExportVideoQDTO.CmeExportInfo cmeExportInfo = new CmeExportVideoQDTO.CmeExportInfo();
+        cmeExportInfo.setName(cmeExportVideo.getName());
+        cmeExportVideoQDTO.setCmeExportInfo(cmeExportInfo);
         try {
             ServiceResponse<String> response = cmeFileApiService.cmeExportVideo(exportVideoQDTO, cmeExportVideoQDTO);
             if (!response.isSuccess()) {

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

@@ -25,36 +25,11 @@ public class CmeExportVideoQO extends CmeExportVideo implements Serializable {
     private String enterpriseId;
 
     /**
-     * 门店id
-     */
-    private String storeId;
-
-    /**
-     * 门店code
-     */
-    private String storeCode;
-
-    /**
-     * 门店名称
-     */
-    private String storeName;
-
-    /**
      * 导购id
      */
     private String clerkId;
 
     /**
-     * 导购code
-     */
-    private String clerkCode;
-
-    /**
-     * 导购名称
-     */
-    private String clerkName;
-
-    /**
      * 父级id (视频所属的分组id)
      */
     private String parentId;
@@ -75,30 +50,6 @@ public class CmeExportVideoQO extends CmeExportVideo implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public String getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(String storeId) {
-        this.storeId = storeId;
-    }
-
-    public String getStoreCode() {
-        return storeCode;
-    }
-
-    public void setStoreCode(String storeCode) {
-        this.storeCode = storeCode;
-    }
-
-    public String getStoreName() {
-        return storeName;
-    }
-
-    public void setStoreName(String storeName) {
-        this.storeName = storeName;
-    }
-
     public String getClerkId() {
         return clerkId;
     }
@@ -107,22 +58,6 @@ public class CmeExportVideoQO extends CmeExportVideo implements Serializable {
         this.clerkId = clerkId;
     }
 
-    public String getClerkCode() {
-        return clerkCode;
-    }
-
-    public void setClerkCode(String clerkCode) {
-        this.clerkCode = clerkCode;
-    }
-
-    public String getClerkName() {
-        return clerkName;
-    }
-
-    public void setClerkName(String clerkName) {
-        this.clerkName = clerkName;
-    }
-
     public String getParentId() {
         return parentId;
     }