Merge branch 'hotfix-43699-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/factory/UserEditData/FiltersHandler.java
#	src/main/java/com/fdkankan/contro/service/impl/IFdkkLaserServiceImpl.java

src/main/java/com/fdkankan/contro/factory/UserEditData/FiltersHandler.java

@@ -69,10 +69,12 @@ public class FiltersHandler implements UserEditDataHandler {
         if(!"eur".equals(env)){
             return;
         }
+        log.info("国际环境，开始初始化滤镜,num:{}", num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         if(scenePlus.getSceneSource() != SceneSource.BM.code()){
             return;
         }
+        log.info("看看场景，开始初始化滤镜,num:{}", num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         String dataSource = scenePlusExt.getDataSource();
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
@@ -85,9 +87,6 @@ public class FiltersHandler implements UserEditDataHandler {
         //获取全景图id
         String visionPath = dataSource + File.separator + "results" + File.separator + "vision.txt";
         List<String> panoramaUuidList = SceneUtil.getPanoramaUuidList(visionPath);
-
-        log.info("panoramaUuidList:", JSON.toJSONString(panoramaUuidList));
-
         //{saturation: 0.35, brightness: 0.35, contrast: 0.4, temperature: 0.25, id: "0"}
         List<JSONObject> collect = panoramaUuidList.stream().map(v -> {
             JSONObject jsonObject = new JSONObject();
@@ -101,6 +100,7 @@ public class FiltersHandler implements UserEditDataHandler {
 
         String key = String.format(RedisKey.SCENE_filter_DATA,num);
         List<String> filterList = collect.stream().map(item->JSON.toJSONString(item)).collect(Collectors.toList());
+        log.info("滤镜数据，filterList,{}",JSON.toJSONString(filterList));
         redisUtil.del(key);
         redisUtil.lRightPushAll(key, filterList);
 

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

@@ -10,6 +10,7 @@ import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
 import com.fdkankan.contro.entity.ScenePro;
 import com.fdkankan.contro.service.IFdkkLaserService;
+import com.fdkankan.contro.service.IScenePlusExtService;
 import com.fdkankan.contro.service.IScenePlusService;
 import com.fdkankan.contro.service.ISceneProService;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
@@ -61,6 +62,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
 
 
     public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime, Date algorithmTime, ScenePlusExt scenePlusExt) {
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
         Map<String, Object> params = new HashMap<>();
         params.put("sceneCode", sceneCode);
         params.put("status", sceneStatus);
@@ -72,6 +74,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         }
         params.put("shootCount", scenePlusExt.getShootCount());
         params.put("mixture", scenePlusExt.getMixture() == CommonStatus.NO.code().intValue() ? false : true);
+        params.put("payStatus", scenePlus.getPayStatus());
         rabbitMqProducer.sendByWorkQueue(updateScene, params);
     }
 
@@ -142,6 +145,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("title", scenePlus.getTitle());
         params.put("userId", scenePlus.getUserId());
         params.put("sceneSource", scenePlus.getSceneSource());
+        params.put("payStatus", scenePlus.getPayStatus());
         if(Objects.nonNull(fdageJson)){
             params.put("location", fdageJson.getInteger("location"));
         }