fix：

1、订单详情显示 预约时间；
2、拼单使用父级 ServiceType:订单类型；

fmTakeout/DTools/pmsOrdersData.cpp

@@ -74,9 +74,6 @@ int  PmsOrdersData::convertPosServiceTypeId( const OrderObject* orderObj, const
         else if ( 7== orderObj->getOrderType() ) {
             tempOrderTypeId = 14;
         }
-        else if ( 8== orderObj->getOrderType() ) {
-            tempOrderTypeId = 0;
-        }
         // MOD渠道对应的业务逻辑 ;  星巴克-MOD,百度外卖,饿了么APP,美团外卖,星巴克-MOP;
         else if("MOD" == orderObj->channel) {
             // platformSource:平台来源:1 app;2 ele;3 ors;4 WeChat ;5 口碑;
@@ -116,8 +113,6 @@ int  PmsOrdersData::convertPosServiceTypeId( const OrderObject* orderObj, const
         }else if("ORS" == orderObj->channel && !orderObj->appointmentDayFlag ){
             tempOrderTypeId = 23;
             //预约系统 支付方式: 1:支付宝; 2:微信; 3:银联; 4:SVC卡; 5/7:MOP使用券或星星抵扣 0元支付; 8:IStore订单; 9:银联支付(=3);
-        }else if("HM" == orderObj->channel){
-            tempOrderTypeId = 14;
         }else{
             tempOrderTypeId = 11;
         }
@@ -134,9 +129,6 @@ int  PmsOrdersData::convertPosServiceTypeId( const OrderObject* orderObj, const
         else if ( 7== orderObj->getOrderType() ) {
             tempOrderTypeId = 15;
         }
-        else if ( 8== orderObj->getOrderType() ) {
-            tempOrderTypeId = 0;
-        }
         // MOD渠道对应的业务逻辑 ;  星巴克-MOD,百度外卖,饿了么APP,美团外卖,星巴克-MOP;
         else if("MOD" == orderObj->channel) {
             // platformSource:平台来源:1 app;2 ele;3 ors;4 WeChat; 5 口碑;

fmTakeout/detailForm.cpp

@@ -44,14 +44,21 @@ void DetailForm::InitData(OrderObject *orderObject)
     QLOG_INFO() << QString("[<<<<---DetailForm::InitData   ui->detailLab0->setText --->>>>]");
     ui->detailLab1->setText(QString("[ %1 ]:[ %2 ]:[%3:%4]").arg(orderObject->consigneeName,orderObject->consigneePhone,
                                                              QString::fromLocal8Bit("暗号"),orderObject->secretSignal));
+
     //订单完成后,送达时间需要更新为 finishTime
-    if(OrderObject::Finished == orderObject->orderStatus){
-        ui->detailLab2->setText( (orderObject->finishTime.isEmpty() || 0==orderObject->finishTime.length() )? QString::fromLocal8Bit("已经送达") : orderObject->finishTime);
-    }else if(OrderObject::Refunded == orderObject->orderStatus){
-         ui->detailLab2->setText(QString(""));
-    }else{
-        ui->detailLab2->setText(orderObject->deliveryTime);
+    QString deliveryFinishTime = "";
+    if (OrderObject::Finished == orderObject->orderStatus) {
+        deliveryFinishTime = (orderObject->finishTime.isEmpty() || 0==orderObject->finishTime.length() )? QString::fromLocal8Bit("已经送达") : orderObject->finishTime;
+    } else if (OrderObject::Refunded == orderObject->orderStatus) {
+        deliveryFinishTime = "                            ";
+    } else {
+        deliveryFinishTime = orderObject->deliveryTime;
     }
+    if (7 == orderObject->orderType) {
+        deliveryFinishTime = deliveryFinishTime + QString::fromLocal8Bit("预约时间: ") + orderObject->expectDate;
+    }
+    ui->detailLab2->setText(deliveryFinishTime);
+
     QLOG_INFO() << QString("[<<<<---DetailForm::InitData   ui->detailLab2->setText --->>>>]");
 
     ui->detailLab3->setText(orderObject->riderName.isEmpty() ? QString::fromLocal8Bit("暂未指定") : QString::fromLocal8Bit("[姓名]%1 [电话]%2")