Merge branch 'xianfeng' of https://git.oschina.net/seventeendai/takeaway into xianfeng

Conflicts:
	fmPrinter/fmPrinter.cpp

fmPrinter/fmPrinter.cpp

@@ -147,16 +147,16 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     if(!pData->channelName.compare("饿了么"))
     {
         print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)+" 饿了么").append("|").append(pData->order_type==3?"自提":pData->delivery_party).append("|").append(pData->order_view_id.isEmpty()?pData->order_id:pData->order_view_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
-                .append("|").append(QString("备注:")+pData->remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
+                .append("|").append(pData->delivery_time>0?QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm"):"立即送达").append("|").append(QString("备注:")+pData->remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
                 .append("|").append(_Penny2Dollar(pData->send_fee)).append("|").append(QString::number(pData->total_amount)).append("|").append(_Penny2Dollar(pData->total_fee-pData->discount_fee)).append("|").append(pData->customer).append("|").append(pData->address).append("|").
                 append(pData->phone);
     }
     else
     {
-        print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)).append(pData->channelName).append("|").append(pData->order_type==3?"自提":pData->delivery_party).append("|").append(pData->order_view_id.isEmpty()?pData->order_id:pData->order_view_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
-                .append("|").append(QString("备注:")+pData->remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
-                .append("|").append(_Penny2Dollar(pData->send_fee)).append("|").append(QString::number(pData->total_amount)).append("|").append(_Penny2Dollar(pData->total_fee-pData->discount_fee)).append("|").append(pData->customer).append("|").append(pData->address).append("|").
-                append(pData->phone);
+            print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)).append(pData->channelName).append("|").append(pData->order_type==3?"自提":pData->delivery_party).append("|").append(pData->order_view_id.isEmpty()?pData->order_id:pData->order_view_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
+                    .append("|").append(pData->delivery_time>0?QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm"):"立即送达").append("|").append(QString("备注:")+pData->remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
+                    .append("|").append(_Penny2Dollar(pData->send_fee)).append("|").append(QString::number(pData->total_amount)).append("|").append(_Penny2Dollar(pData->total_fee-pData->discount_fee)).append("|").append(pData->customer).append("|").append(pData->address).append("|").
+                    append(pData->phone);
     }
     //鲜丰水果
     // if(!v.compare("顾客留存"))

fmTakeaway/detailForm.cpp

@@ -120,7 +120,6 @@ void DetailForm::InitData(OrderObject *orderObject)
     {
         ui->detailBtn3->hide();
     }
-    m_refuseform=new RefuseForm(this);
 }
 
 void DetailForm::_Init()
@@ -171,15 +170,18 @@ void DetailForm::on_detailBtn2_clicked()
     QString refuse_reason;
     if(m_orderObject->delivery_status==2)
     {
-       refuse_reason = "8";
-    }else
+        refuse_reason = "8";
+        emit dorefund(m_orderObject->order_id,refuse_reason);
+    }
+    else
     {
+        RefuseForm *m_refuseform=new RefuseForm(this);
         m_refuseform->show();
         if(m_refuseform->exec()==QDialog::Accepted)
         {
             refuse_reason = m_refuseform->m_reasonCode;
+            emit dorefund(m_orderObject->order_id,refuse_reason);
+            delete m_refuseform;
         }
     }
-
-    emit dorefund(m_orderObject->order_id,refuse_reason);
 }

fmTakeaway/detailForm.h

@@ -36,7 +36,6 @@ private:
      * 返回:NULL
      * */
     void _Init();
-    RefuseForm* m_refuseform;
 
 signals:
     /* 功能:处理订单