备份代码

src/main/java/com/chint/domain/aggregates/order/OrderEvent.java

@@ -112,10 +112,10 @@ public class OrderEvent implements Serializable {
 
     public static String mapToHotelOrderDetailStatus(Integer eventType){
         return switch (eventType) {
-            case ORDER_EVENT_PREPARE -> FSSC_HOTEL_STATUS_REFUND; //未下单 改成3
+            case ORDER_EVENT_PREPARE -> FSSC_HOTEL_STATUS_SUCCESS; //未下单 改成3
             case ORDER_EVENT_PAYED -> FSSC_HOTEL_STATUS_SUCCESS;
             case ORDER_EVENT_CHANGE -> FSSC_HOTEL_STATUS_SUCCESS;
-            case ORDER_EVENT_CANCEL -> FSSC_HOTEL_STATUS_SUCCESS; //e额外生成的单子为3 退票虽然是3 返回为1
+            case ORDER_EVENT_CANCEL -> FSSC_ORDER_STATUS_CANCEL; //e额外生成的单子为3 退票虽然是3 返回为1
             case ORDER_EVENT_ORDERED -> FSSC_HOTEL_STATUS_SUCCESS;
             case ORDER_EVENT_REFUND -> FSSC_HOTEL_STATUS_SUCCESS;
             case ORDER_EVENT_UNKNOWN -> FSSC_ORDER_STATUS_CANCEL;

src/main/java/com/chint/domain/aggregates/order/order_record/OrderHotelRecord.java

@@ -227,8 +227,11 @@ public class OrderHotelRecord extends OrderBaseRecord {
     }
 
     // 加载发票和费用信息
-    public OrderHotelRecord loadInvoiceAndFeeInfo(String invoiceType, String invoiceFee, String custodayFee,
-                                                  String noTaxCusFee, String taxCusFee) {
+    public OrderHotelRecord loadInvoiceAndFeeInfo(String invoiceType,
+                                                  String invoiceFee,
+                                                  String custodayFee,
+                                                  String noTaxCusFee,
+                                                  String taxCusFee) {
         this.setInvoiceType(invoiceType);
         this.setInvoiceFee(invoiceFee);
         this.setCustodayFee(custodayFee);

src/main/resources/application-test.yml

@@ -48,10 +48,10 @@ logging:
 #正式
 ly:
   appId: zhengtai
-  account: 4f9cb1080b564dd0a94aa95f7a19c8b5
-  password: 1fD3SutgzfS48qznYQiq
-  secret: WOHzCMvHd823iHgH
-  baseUrl: https://api.qa.dttrip.cn/openapi
+  account: ab9fe0c19dd64a99b936fded72c3bb94
+  password: glHRJJ9JMUwNfQ8OwAQi
+  secret: MnghmYJpM1U2RaLx
+  baseUrl: https://api.dttrip.cn/openapi
   ifForwardRequest: false
   forwardRequestBaseUrl: https://secureqrdev-t.chint.com/llz