Ver código fonte

修改logo生成逻辑

tianboguang 2 anos atrás
pai
commit
de007ec6eb

+ 6 - 0
src/main/java/com/fdkankan/contro/entity/SceneEditInfoExt.java

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

+ 3 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -272,7 +272,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
 
             this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
             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() : sceneEditInfoExt.getShareLogoImg();
+
+            createQrCode(sceneCode, scenePlusExt, qrLogo);
 
 
             //计算成功,通知APP
             //计算成功,通知APP
             Integer pushChannel = fdageData.getInteger("pushChannel");
             Integer pushChannel = fdageData.getInteger("pushChannel");