合并obt代码

src/main/java/com/fdkankan/contro/entity/SceneEditInfoExt.java

@@ -62,6 +62,12 @@ public class SceneEditInfoExt {
     private String mosaics;
 
     /**
+     * mosaics数据
+     */
+    @TableField("share_logo_img")
+    private String shareLogoImg;
+
+    /**
      * 是否有场景关联(0-否，1-是)
      */
     @TableField("links")

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -272,7 +272,11 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
 
-            createQrCode(sceneCode, scenePlusExt, ObjectUtils.isEmpty(company) ? null : company.getQrLogo());
+            String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : null;
+
+            qrLogo = ObjectUtils.isEmpty(qrLogo) && !ObjectUtils.isEmpty(sceneEditInfoExt.getShareLogoImg()) ? fYunFileConfig.getHost().concat(sceneEditInfoExt.getShareLogoImg()) : null;
+
+            createQrCode(sceneCode, scenePlusExt, qrLogo);
 
             //计算成功，通知APP
             Integer pushChannel = fdageData.getInteger("pushChannel");

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -219,6 +219,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         sceneFileBuild = new SceneFileBuild();
         sceneFileBuild.setChildName(mac);
         sceneFileBuild.setFileId(fileId);
+        sceneFileBuild.setRecStatus("A");
         sceneFileBuild.setUnicode(folderName);
         sceneFileBuild.setTotalPicNum(Integer.valueOf(totalPicNum));
         sceneFileBuild.setChunks(Integer.valueOf(chunks));