1

src/api/didahotel.ts

@@ -44,6 +44,21 @@ static async GetDiDaPriceConfirm(param:any): Promise<HttpResponse> {
 static async GetDiDaBookingConfirm(param:any): Promise<HttpResponse> {
   return request('dmc_post_GetDiDaBookingConfirm', param)
 }
+
+//散客订单取消确认
+static async GetDiDaBookingCancelConfirm(param:any): Promise<HttpResponse> {
+  return request('dmc_post_GetDiDaBookingCancelConfirm', param)
+}
+
+//散客订单预取消
+static async GetDiDaBookingCancel(param:any): Promise<HttpResponse> {
+  return request('dmc_post_GetDiDaBookingCancel', param)
+}
+
+//散客订单详情
+static async GetDiDaBookingSearchList(param:any): Promise<HttpResponse> {
+  return request('dmc_post_GetDiDaBookingSearchList', param)
+}
   // 道旅酒店列表
   static async GetDidaHotelList(param: any): Promise<HttpResponse> {
     param.reviewRatingUpperLimits = param.reviewRatingUpperLimits && param.reviewRatingUpperLimits != '' ? param.reviewRatingUpperLimits : 0

src/components/scattered/order/OrderList.vue

@@ -141,26 +141,18 @@
         </div>
         <div class="rounded-borders q-pa-sm justify-between" :class="{ 'column': $q.platform.is.desktop, 'row items-center': $q.platform.is.mobile, 'bg-green-1': x.OrderStatus != '已取消', 'bg-grey-2': x.OrderStatus == '已取消' }">
           <q-list dense :class="{ 'row items-center justify-between full-width': $q.platform.is.mobile }">
-            <q-item v-if="x.OrderStatus != '已取消'" class="text-negative" clickable v-close-popup @click="canCelHotel(x.ThirdOrderNo)">
+            <q-item v-if="x.OrderStatus != '已取消'" class="text-negative" clickable v-close-popup @click="canCelHotel(x.ThirdOrderNo,x.Source)">
               <q-item-section>
                 <q-item-label>{{ $t('hotelorder.opera.cancel') }}</q-item-label>
               </q-item-section>
             </q-item>
-            <q-item class="text-positive" clickable v-close-popup @click="getDetail(x.OrderID)">
+            <q-item class="text-positive" clickable v-close-popup @click="getDetail(x.OrderID,x.Source)">
               <q-item-section>
                 <q-item-label>{{ $t('v101.scatteredOrderList.xiangqing') }}</q-item-label>
               </q-item-section>
             </q-item>
           </q-list>
-          <!-- <div v-else>
-            <div class="f12 text-green-4">{{ $t('hotelorder.payed') }}</div>
-            <div class="text-subtitle1 din text-green-14">
-              {{ moneyFormat(x.totalMoney) }}
-              <span class="text-green-4 f12">
-                {{$t('unit.jp')}}
-              </span>
-            </div>
-          </div> -->
+       
         </div>
       </div>
       <div v-if="x.OrderStatus == 3">
@@ -184,7 +176,9 @@
   <q-dialog v-model="showOrderdDetail">
     <OrderdDetail :OrderID="OrderID"></OrderdDetail>
   </q-dialog>
-
+  <q-dialog v-model="showOrderdDidaDetail">
+    <OrderdDiDaDetail :OrderID="OrderID"></OrderdDiDaDetail>
+  </q-dialog>
   <q-dialog v-model="showBankAccount">
     <BankAccount @change="showBankAccount=false"></BankAccount>
   </q-dialog>
@@ -195,6 +189,7 @@
 import { DirtionmaryHelper } from '../../../config/dictionary'
 import { defineComponent, inject, reactive, toRefs, watch } from 'vue'
 import HotelService from '../../../api/scattered'
+import DidaService from '../../../api/didahotel'
 import { ApiResult } from '../../../@types/enumHelper'
 import message from '../../../utils/message'
 import { RoomType, StandardStatus } from '../../../@types'
@@ -204,10 +199,12 @@ import svgIcon from '../../../global/svg-icon.vue'
 import { copyToClipboard, useQuasar } from 'quasar'
 import { currentRouter } from '../../../router'
 import OrderdDetail from './OrderdDetail.vue'
+import OrderdDiDaDetail from './OrderdDiDaDetail.vue'
+
 import BankAccount from '../../BankAccount.vue'
 
 export default defineComponent({
-  components: { OrderdDetail, BankAccount },
+  components: { OrderdDetail, BankAccount,OrderdDiDaDetail },
   setup(props) {
     const search = inject(DirtionmaryHelper.HOTEL_ORDER_SEARCH) as any
     const { t } = useI18n()
@@ -225,6 +222,7 @@ export default defineComponent({
       showBankAccount: false,
       OrderID: '',
       showOrderdDetail: false,
+      showOrderdDidaDetail: false,
       orders: [] as Array<any>,
       status: [] as Array<StandardStatus>,
       rooms: [] as Array<RoomType>,
@@ -253,14 +251,18 @@ export default defineComponent({
       ViewPayment() {
         data.showBankAccount = true
       },
-      canCelHotel(ThirdOrderNo) {
+      canCelHotel(ThirdOrderNo,Source) {
         $q.dialog({
           title: t('dialog.titles.horder'),
           message: t('dialog.contents.horder'),
           cancel: true,
           persistent: true
         }).onOk(() => {
-          methods.cancellations(ThirdOrderNo)
+           if (Source==4) {
+            methods.didacancellations(ThirdOrderNo)
+           }else{
+            methods.cancellations(ThirdOrderNo)
+          }
         })
       },
       cancellations(ThirdOrderNo){
@@ -287,8 +289,58 @@ export default defineComponent({
             data.loadingCel = false
           })
       },
-      getDetail(OrderID){
-        data.showOrderdDetail = true
+
+      didacancellations(ThirdOrderNo){
+        if(data.loadingCel) return
+        let msg ={
+          BookingID:ThirdOrderNo,
+        }
+        let param = Object.assign(msg)
+        data.loadingCel = true
+        DidaService.GetDiDaBookingCancel(param)
+          .then(r => {
+            if (r.data.resultCode == ApiResult.SUCCESS) {
+              let calmsg={
+                BookingID:ThirdOrderNo,
+                CancelBy: search.CustomerId,
+                CancelType:2,
+                Amount:r.data.data.Amount,
+                ConfirmID:r.data.data.ConfirmID
+              }
+              console.log("r.data",r.data);
+              let paramcal = Object.assign(calmsg)
+                DidaService.GetDiDaBookingCancelConfirm(paramcal)
+            .then(rc => {
+              if (rc.data.resultCode == ApiResult.SUCCESS) {
+              
+                message.successMsg(`${t('success')}`)
+                methods.initOrders()
+              } else {
+                message.errorMsg(rc.data.message)
+              }
+              data.loadingCel = false
+            })
+            .catch(ec => {
+              message.errorMsg(ec.message)
+              data.loadingCel = false
+            })
+            } else {
+              message.errorMsg(r.data.message)
+            }
+            data.loadingCel = false
+          })
+          .catch(e => {
+            message.errorMsg(e.message)
+            data.loadingCel = false
+          })
+      },
+      getDetail(OrderID,Source){
+        if (Source==4){
+          data.showOrderdDidaDetail = true
+        }else{
+          data.showOrderdDetail = true
+        }
+      
         data.OrderID = OrderID
       },
       initOrders() {

src/components/scattered/order/OrderdDetail.vue

@@ -144,6 +144,7 @@ import { date } from 'quasar'
 import message from '../../../utils/message'
 import { moneyFormat, dateDiffer } from '../../../utils/tools'
 import HotelService from '../../../api/scattered'
+import DidaService from '../../../api/didahotel'
 import { currentRouter } from 'src/router'
 import { HotelRate,HotelArea, useHotel } from '../../../utils/hotelRate'
 import { isPhone, validatAlphabetsName } from '../../../utils/validate'

src/config/dictionary.ts

@@ -98,6 +98,12 @@ class DirtionmaryHelper {
    */
    static readonly SCATTERED_HOTEL_ORDER_MSG = "scatteredhotelordermsg"
 
+
+     /**
+   * 道旅散客预约酒店缓存客房下单成功的详情数据
+   */
+     static readonly SCATTERED_DIDAHOTEL_ORDER_MSG = "scattereddidahotelordermsg"
+
   /**
    * 用户是否在中国
    */

src/i18n/ja-RB/index.ts

@@ -535,6 +535,7 @@ export default {
       chengren: '大人です',
       ertong: '子供です',
       ertongage:'子供の年齢',
+      age:'年齢',
       pingfen: '採点です',
       minpingfen: '最低評価です',
       maxpingfen: '最高評価です',
@@ -826,6 +827,7 @@ export default {
       dangqiandizhi: '現在のアドレスです',
       Email: 'メール',
       dianhua: '電話です',
+      ertongshucuowu: '子供の数が正しくない',
       kehuxuqiu: '顧客ニーズです',
       kehubeizhu: '顧客コメントです',
       fangjian: '部屋です',

src/i18n/ko-HG/index.ts

@@ -535,6 +535,7 @@ export default {
       chengren: '어른',
       ertong: '어린이들입니다',
       ertongage:'어린이 나이',
+      age:'나이',
       pingfen: '평점',
       minpingfen: '최저 평점',
       maxpingfen: '최고 평점',
@@ -826,6 +827,7 @@ export default {
       dangqiandizhi: '현재 주소',
       Email: '이메일',
       dianhua: '전화요',
+      ertongshucuowu:'아동 수가 정확하지 않다',
       kehuxuqiu: '고객 요구',
       kehubeizhu: '고객 설명',
       fangjian: '방',
@@ -835,6 +837,7 @@ export default {
       quxiao1: '취소가 통보되지 않았습니다',
       quxiao2: '입주 당일 취소',
       shouxufei: '수속비',
+      quxiaoshijian:'시작 취소',
       youhuixingxi: '할인 정보',
       duihuan: '교환',
       youhuiquanduihuan: '쿠폰 교환',

src/i18n/zh-SW/index.ts

@@ -535,6 +535,7 @@ export default {
       chengren: '成人',
       ertong: '儿童',
       ertongage: '儿童年龄',
+      age: '年龄',
       pingfen: '评分',
       minpingfen: '最低评分',
       maxpingfen: '最高评分',

src/i18n/zh-TW/index.ts

@@ -536,6 +536,7 @@ export default {
       chengren: '成人',
       ertong: '兒童',
       ertongage:'兒童年齡',
+      age:'年齡',
       pingfen: '評分',
       minpingfen: '最低評分',
       maxpingfen: '最高評分',
@@ -830,6 +831,7 @@ export default {
       dangqiandizhi: '當前地址',
       Email: 'Email',
       dianhua: '電話',
+      ertongshucuowu:'兒童數不正確',
       kehuxuqiu: '客戶需求',
       kehubeizhu: '客戶备注',
       fangjian: '房間',
@@ -839,6 +841,7 @@ export default {
       quxiao1: '沒有通知取消',
       quxiao2: '入住當日取消',
       shouxufei: '手續費',
+      quxiaoshijian:'起取消',
       youhuixingxi: '優惠信息',
       duihuan: '兌換',
       youhuiquanduihuan: '優惠券兌換',