1：新增销售单写入汇报接口

fmTakeaway/Control/flowControl.cpp

@@ -247,20 +247,11 @@ bool FlowControl::_PullOrder()
                         }
                     }
 
-//                    QDateTime ctime(QDateTime::currentDateTime());
-//                    ctime.setTime(QTime(0,0));
-
-//                    if(QDateTime::fromTime_t(orderObject->create_time)<ctime)
-//                    {
-
-//                        bWrite = false;
-//                    }
-
                     if(bWrite)
                     {
                         QLOG_INFO() << QString("will entry %1").arg(orderObject->order_id);
-                        QTimer::singleShot(1000*60*120, [orderObject](){
-                        //QTimer::singleShot(1000*10, [orderObject](){
+                        QTimer::singleShot(1000*60*120, [orderObject, this](){
+                        //QTimer::singleShot(1000*20, [orderObject,this](){
                             if(orderObject->status == 6 || orderObject->status == 200)
                             {
                                 QString error;
@@ -269,10 +260,12 @@ bool FlowControl::_PullOrder()
                                     if(FmPlugin::GetInstance().DoOrderEntry(orderObject,"","","","",error))
                                     {
                                         QLOG_INFO() << QString("_PullOrder DoOrderEntry successful %1").arg(orderObject->order_id);
+                                        this->_ReportBillEntryResult(orderObject->order_id, 1, QString("成功"));
                                         break;
                                     }else
                                     {
                                         QLOG_INFO() << QString("_PullOrder DoOrderEntry failed %1 %2").arg(orderObject->order_id, error);
+                                        this->_ReportBillEntryResult(orderObject->order_id, 0, error);
                                     }
                                 }
                             }else
@@ -283,6 +276,7 @@ bool FlowControl::_PullOrder()
 
                     }else
                     {
+                        _ReportBillEntryResult(orderObject->order_id, 0, QString("销售单数据有误"));
                         QLOG_INFO() << QString("销售单数据有误 %1").arg(orderObject->order_id);
                     }
                 }
@@ -548,6 +542,23 @@ bool FlowControl::_CompleteOrder(const QString& orderId)
     return result;
 }
 
+bool FlowControl::_ReportBillEntryResult(const QString &orderId, int status, const QString &error)
+{
+    bool result;
+    QJsonObject sendJson;
+    QJsonObject recvJson;
+
+    sendJson = DataManger::GetInstance().GetReportOERData(orderId, status, error);
+
+    QLOG_INFO() << QString("[---report bill result---]. [requestData:%1]").arg(_GetJsonStr(sendJson));
+    QString error1;
+    result = m_procOrderSocket->Request(sendJson, recvJson, error1);
+    QLOG_INFO() << QString("report bill result finsh. [result:%1][msg:%2][recvData:%3]")
+                   .arg(result).arg(error1, _GetJsonStr(recvJson));
+
+    return result;
+}
+
 bool FlowControl::_RefuseRefund(const QString& orderId)
 {
     QString error;
@@ -671,6 +682,8 @@ bool FlowControl::_CheckCashiers()
     return result;
 }
 
+
+
 QString FlowControl::_GetJsonStr(const QJsonObject &json)
 {
     return QString(QJsonDocument(json).toJson(QJsonDocument::Compact)).replace("\"","");

fmTakeaway/Control/flowControl.h

@@ -172,6 +172,13 @@ private slots:
      * 返回:合法true不合法false
      * */
     bool _CheckCashiers();
+
+    /* 功能:提交销售单写入结果
+     * 参数:NULL
+     * 返回:是否成功
+     * */
+    bool _ReportBillEntryResult(const QString& orderId, int status, const QString& error);
+
     /* 功能:获取Json对象的字符
      * 参数:NULL
      * 返回:Json字符串

fmTakeaway/DTools/dataManger.cpp

@@ -8,6 +8,7 @@ enum
     REFUSE_ORDER,COMPLETE_ORDER = 16,
     REFUSE_REFUND = 18,SEND_ORDER = 19,
     REFUND_ORDER = 20, GET_DELIVER=21,
+    REPORT_BILL_RESULT = 23,
     UPDATE_STOCK=80
 };
 
@@ -151,3 +152,16 @@ QJsonObject DataManger::GetSynStockData(const QList<StockObject> &stockList)
     rObj.insert(JSON_POSVERSION, APP_VERSION);
     return rObj;
 }
+
+QJsonObject DataManger::GetReportOERData(const QString &orderId, int status, const QString &error)
+{
+    QJsonObject rObj, cObj;
+    rObj.insert(JSON_REQTYPE, REPORT_BILL_RESULT);
+    cObj.insert(JSON_ORDERID, orderId);
+    cObj.insert("bill_status", status);
+    cObj.insert(JSON_REASON, error);
+    rObj.insert(JSON_ORDER, cObj);
+    rObj.insert(JSON_TOKEN, m_token);
+    rObj.insert(JSON_POSVERSION, APP_VERSION);
+    return rObj;
+}

fmTakeaway/DTools/dataManger.h

@@ -68,6 +68,12 @@ public:
      * */
     QJsonObject GetSynStockData(const QList<StockObject>& stockList);
 
+    /* 功能:获取汇报销售单写入结果数据
+     * 参数:[1]订单ID[2]错误信息
+     * 返回:汇报销售单写入结果数据
+     * */
+    QJsonObject GetReportOERData(const QString& orderId, int status, const QString& error);
+
 private:
     DataManger(){}
     DataManger(DataManger const&);

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-05-04T14:41:21. -->
+<!-- Written by QtCreator 4.0.0, 2017-05-06T00:16:28. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>