Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-web/src/main/java/com/clx/performance/service/impl/LargeScreenServiceImpl.java

@@ -138,6 +138,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
                 .map(Result::getData).orElseThrow(PerformanceResultEnum.HTTP_ERROR);
         JSONArray jsonArray = new JSONArray();
         String name = vo.getAddressShorter();
+        String s = "<div style='max-width:180px;'><div style='display:flex;flex-direction:column;width:fit-content;margin:0auto;'><div style='text-align:center;'>name</div></div></div>";
+
         BigDecimal longitude = vo.getLongitude().setScale(4, RoundingMode.DOWN);
         BigDecimal latitude = vo.getLatitude().setScale(4, RoundingMode.DOWN);
         JSONObject jsonObject = new JSONObject();
@@ -145,7 +147,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         jsonObject.set("lng", longitude);
         jsonObject.set("lat", latitude);
         jsonObject.set("name", name);
-        jsonObject.set("value", "");
+        jsonObject.set("info", s.replace("name", name));
         jsonObject.set("iconField", "ok");
         jsonArray.add(jsonObject);
         return jsonArray.toString();
@@ -156,8 +158,9 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         List<SystemAddressVO> list = Optional.of(orderFeign.getOrderListByReceiveAddressId(addressId)).filter(Result::succeed)
                 .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         JSONArray jsonArray = new JSONArray();
-
+        String s = "<div style='max-width:180px;'><div style='display:flex;flex-direction:column;width:fit-content;margin:0auto;'><div style='text-align:center;'>name</div></div></div>";
         for (SystemAddressVO vo : list) {
+
             String name = vo.getAddressShorter();
             BigDecimal longitude = vo.getLongitude().setScale(4, RoundingMode.DOWN);
             BigDecimal latitude = vo.getLatitude().setScale(4, RoundingMode.DOWN);
@@ -166,7 +169,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
             jsonObject.set("lng", longitude);
             jsonObject.set("lat", latitude);
             jsonObject.set("name", name);
-            jsonObject.set("value", "");
+            jsonObject.set("info", s.replace("name", name));
             jsonObject.set("iconField", "ok");
             jsonArray.add(jsonObject);
         }