已合并 PR 10051: 酒店1挡差标支持手动输入，用车订单明细恢复自动更新逻辑

src/main/java/com/chint/application/queryies/estimate/CTripEstimatePrice.java

@@ -253,6 +253,12 @@ public class CTripEstimatePrice implements EstimatePrice {
         if (success) {
             HotelValuationResult hotelValuationResult = estimate.getData().getHotelValuationResult();
             String price = hotelValuationResult.getMaxPrice().toString();
+
+            if(Double.parseDouble(price) == 0){
+                hotelPriceData.setSuccess(false);
+                return hotelPriceData;
+            }
+
             String arriveData = priceQueryData.getArriveDate();
             String departDate = priceQueryData.getDepartDate();
             if (arriveData != null) {

src/main/java/com/chint/domain/factoriy/order_detail/CTripOrderExtensionFactoryImpl.java

@@ -62,7 +62,7 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
             if (first.get().getCarOrderDetail() == null) {
                 carOrderDetail = new CarOrderDetail();
             } else {
-                return first.get().getCarOrderDetail();
+                carOrderDetail = first.get().getCarOrderDetail();
             }
         } else {
             carOrderDetail = new CarOrderDetail();
@@ -265,7 +265,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
         }
 
 
-
 //        flightOrderDetail.setSupplier(SUPPLIER_C_TRIP_EXTENSION_NAME);
 
         flightOrderDetail.setTrvaleSysType(TRAVAL_SYS_TYPE_CTRIP);

src/main/java/com/chint/infrastructure/constant/CommonMessageConstant.java

@@ -18,6 +18,7 @@ public class CommonMessageConstant {
     public static final String REDIRECT_NOT_EXIST = "暂无跳转地址";
     public static final String LEG_CHANGE_MAX_ERROR = "最多支持变更两次";
     public static final String NO_PRICE_ERROR = "无估算价格";
+    public static final String HOTEL_MAX_PRICE = "无估算价格";
 
     public static final String RESULT_SUCCESS_CODE = "1";
     public static final String RESULT_ERROR_CODE = "0";

src/main/java/com/chint/interfaces/rest/bpm/dot/ANBPMBack.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 @Data
 public class ANBPMBack {
-    private String data;
+    private Object data;
     private String message;
     private String messageType;
     private Boolean success;

src/main/java/com/chint/interfaces/rest/ly/in/LYCallBackDataHandler.java

@@ -119,7 +119,6 @@ public class LYCallBackDataHandler {
                     .outStatus(outStatus)
                     .eventType(ORDER_EVENT_ETA)
                     .sendToQueue();
-
         } else {
             Command.of(OrderStatusChangeCommand.class)
                     .orderDetail(orderDetail)

src/main/resources/application-prod.yml

@@ -80,7 +80,7 @@ bpm:
   #集团H3
   H3BPMUrl: https://bpm10.chint.com
   #电源
-  DYBPMUrl: https://bpm10ps.chint.com #测试地址
+  DYBPMUrl: https://bpm10ps.chint.com
   #新能
   XNBPMUrl: https://bpm.astronergy.com.cn
   xn-client-id: xclient