Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-05-18 d8440cc93f48e5a4b932d8daf740023e16d65008

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -2542,7 +2542,7 @@
                            }

                            // 天气预报动态调价
                            JSONArray ws = jsonObject.getJSONArray("weather");
                            JSONArray ws = jsonObject.getJSONArray("weatherRules");
                            if (null != ws) {
                                WeatherDTO data = xpMapClient.wether(order.getCityCode()).getData();
                                List<WeatherDTO.Lives> lives = data.getLives();
@@ -2550,8 +2550,8 @@
                                    String w = lives.get(0).getWeather();
                                    for (Object o : ws) {
                                        JSONObject ele = JSONObject.parseObject(o.toString());
                                        if (w.contains(ele.getString("weatherType"))) {
                                            double floatRate = jsonObject.getDouble("ratio");
                                        if (w.contains(ele.getString("weatherType")) || ele.getString("weatherType").contains(w)) {
                                            double floatRate = ele.getDouble("ratio");
                                            priceRate = new BigDecimal(priceRate).add(new BigDecimal(floatRate)).doubleValue();
                                            break;
                                        }
@@ -2663,7 +2663,7 @@
                            }

                            // 天气预报动态调价
                            JSONArray ws = jsonObject.getJSONArray("weather");
                            JSONArray ws = jsonObject.getJSONArray("weatherRules");
                            if (null != ws) {
                                WeatherDTO data = xpMapClient.wether(order.getCityCode()).getData();
                                List<WeatherDTO.Lives> lives = data.getLives();
@@ -2671,8 +2671,8 @@
                                    String w = lives.get(0).getWeather();
                                    for (Object o : ws) {
                                        JSONObject ele = JSONObject.parseObject(o.toString());
                                        if (w.contains(ele.getString("weatherType"))) {
                                            double floatRate = jsonObject.getDouble("ratio");
                                        if (w.contains(ele.getString("weatherType")) || ele.getString("weatherType").contains(w)) {
                                            double floatRate = ele.getDouble("ratio");
                                            priceRate = new BigDecimal(priceRate).add(new BigDecimal(floatRate)).doubleValue();
                                            break;
                                        }