Merge commit 'cc28e1fe199ec412022bb271e37d8ad10ad3fda9'

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/impl/SmsbAppointmentInfoServiceImpl.java

@@ -243,11 +243,15 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
             SmsbDeviceChatScScene scScene = new SmsbDeviceChatScScene();
             JSONObject interaction = JSONUtil.parseObj(item);
             scScene.setInteractionName(interaction.getStr("interactionName"));
-            StringBuilder builder = new StringBuilder();
-            interaction.getJSONArray("photo").forEach(
-                photo -> builder.append(photo).append(",")
-            );
-            scScene.setPhoto(builder.toString());
+            JSONArray photoList = interaction.getJSONArray("photo");
+            if (photoList != null && photoList.size() > 0) {
+                StringBuilder builder = new StringBuilder();
+                for (int i = 0; i < photoList.size(); i++) {
+                    builder.append("https://ndtpc.com").append(photoList.get(i)).append(",");
+                }
+                // 去掉结尾的，逗号
+                scScene.setPhoto(builder.toString().substring(0, builder.length() - 1));
+            }
             scScene.setSupplierName(interaction.getStr("supplierName"));
             scScene.setApplicationValue(interaction.getStr("applicationValue"));
             scScene.setDescription(interaction.getStr("description"));
@@ -749,7 +753,10 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
                     for (SmsbDeviceChatScSceneVo sceneItem : sceneVoList) {
                         SmsbScDeviceStartProductVO productVO = new SmsbScDeviceStartProductVO();
                         productVO.setName(sceneItem.getInteractionName());
-                        productVO.setPhoto(sceneItem.getPhoto());
+                        String photos = sceneItem.getPhoto();
+                        if (!StringUtils.isEmpty(photos)) {
+                            productVO.setPhoto(photos.split(",")[0]);
+                        }
                         productVOList.add(productVO);
                     }
                     if (productVOList.size() > 3) {