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

fmTakeaway/Control/flowControl.h

@@ -183,6 +183,12 @@ private slots:
      * */
     bool _ReportBillEntryResult(const QString& orderId, int status, const QString& error);
 
+    /* 功能:核销订单(用于自提订单)
+     * 参数:NULL
+     * 返回:是否成功
+     * */
+    bool _ChargeOffOrder(const QString& orderId);
+
     /* 功能:获取Json对象的字符
      * 参数:NULL
      * 返回:Json字符串

fmTakeaway/DTools/dataManger.cpp

@@ -8,7 +8,7 @@ enum
     REFUSE_ORDER,COMPLETE_ORDER = 16,
     REFUSE_REFUND = 18,SEND_ORDER = 19,
     REFUND_ORDER = 20, GET_DELIVER=21,
-    REPORT_BILL_RESULT = 23,
+    REPORT_BILL_RESULT = 23,CHARGEOFF_ORDER=71,
     UPDATE_STOCK=80
 };
 
@@ -165,3 +165,15 @@ QJsonObject DataManger::GetReportOERData(const QString &orderId, int status, con
     rObj.insert(JSON_POSVERSION, APP_VERSION);
     return rObj;
 }
+
+QJsonObject DataManger::GetChargeOffData(const QString &orderId)
+{
+    QJsonObject rObj, cObj;
+    rObj.insert(JSON_REQTYPE, CHARGEOFF_ORDER);
+    cObj.insert(JSON_ORDERID, orderId);
+    // 暂时没有取餐码
+    cObj.insert("delivery_code", orderId);
+    rObj.insert(JSON_ORDER, cObj);
+    rObj.insert(JSON_POSVERSION, APP_VERSION);
+    return rObj;
+}

fmTakeaway/DTools/dataManger.h

@@ -74,6 +74,12 @@ public:
      * */
     QJsonObject GetReportOERData(const QString& orderId, int status, const QString& error);
 
+    /* 功能:获取核销订单的数据
+     * 参数:[1]订单ID
+     * 返回:汇报销售单写入结果数据
+     * */
+    QJsonObject GetChargeOffData(const QString& orderId);
+
 private:
     DataManger(){}
     DataManger(DataManger const&);

fmTakeaway/detailForm.cpp

@@ -105,7 +105,14 @@ void DetailForm::InitData(OrderObject *orderObject)
         ui->detailBtn2->setText("同意退款");
     }
 
-    ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status));
+    if(orderObject->order_type==3)
+    {
+         ui->detailBtn3->setText("核销");
+    }else
+    {
+        ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status));
+    }
+
     ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status));
     ui->detailBtn3->setProperty("orderId", orderObject->order_id);
 

fmTakeaway/mainForm.cpp

@@ -394,7 +394,14 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
         pBtn->setObjectName("mainProcBtn");
         pBtn->setProperty("orderId", orderObject->order_id);
         pBtn->setProperty("operation", table->property("operation").toString());
-        pBtn->setText(table->property("operationName").toString());
+        if(orderObject->order_type==3)
+        {
+             pBtn->setText("核销");
+        }else
+        {
+             pBtn->setText(table->property("operationName").toString());
+        }
+
         hLayout->addWidget(pBtn);
         hLayout->setMargin(0);
         pWdg->setLayout(hLayout);