显示订单的ＩD以viewID优先，修改服务费为0 的不入账

fmPlugin/fmPlugin.cpp

@@ -388,7 +388,7 @@ double FmPlugin::_Penny2Dollar(int penny)
 QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
 {
     QJsonObject rObj;
-    rObj.insert("uuid", orderObject->order_id);
+    rObj.insert("uuid", orderObject->order_view_id.isEmpty()?orderObject->order_id:orderObject->order_view_id);
 
     rObj.insert("senderCode", m_storeId);
     rObj.insert("senderWrh", "-");

fmPrinter/fmPrinter.cpp

@@ -136,14 +136,14 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     QString print;
     if(!pData->channelName.compare("饿了么"))
     {
-        print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)+" 饿了么").append("|").append(pData->order_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
+        print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)+" 饿了么").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);
     }
     else
     {
-        print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)).append(pData->channelName).append("|").append(pData->order_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
+        print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)).append(pData->channelName).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);

fmTakeaway/Control/flowControl.cpp

@@ -159,6 +159,11 @@ bool FlowControl::_PullOrder()
                     orderObject = new OrderObject(this);
                     orderObject->FromJson(jsonObject);
                     m_ordersMap.insert(orderObject->order_id, orderObject);
+                    if(!orderObject->order_view_id.isEmpty())
+                    {
+                        m_view2Id.insert(orderObject->order_view_id, orderObject->order_id);
+                    }
+
                     QLOG_INFO() << QString("new order[%1:%2].[data:%3]")
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
@@ -233,6 +238,14 @@ bool FlowControl::_PullOrder()
                         }
                     }
 
+                    if(!orderObject->channel.compare("jdwm"))
+                    {
+                        if(orderObject->service_fee <= 0)
+                        {
+                            bWrite = false;
+                        }
+                    }
+
                     QString error;
                     if(bWrite)
                     {
@@ -769,7 +782,15 @@ void FlowControl::onGetOrderDetails(const QString &orderId)
     //    if(_CheckCashiers())
     //    {
     emit hideAlert();
-    emit showOrderDetails(m_ordersMap.value(orderId));
+    QString lOrderId;
+    if(m_view2Id.contains(orderId))
+    {
+        lOrderId = m_view2Id.value(orderId);
+    }else
+    {
+        lOrderId = orderId;
+    }
+    emit showOrderDetails(m_ordersMap.value(lOrderId));
     //    }
 }
 

fmTakeaway/Control/flowControl.h

@@ -45,6 +45,10 @@ private:
     // 当前收银员
     CashierObject m_cashierObject;
 
+
+    // viewId _ orderId
+    QMap<QString, QString> m_view2Id;
+
 signals:
     /* 功能:连接数据库完成
      * 参数:[1]是否成功[2]错误信息

fmTakeaway/mainForm.cpp

@@ -361,7 +361,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
     QTableWidgetItem *item0 = new QTableWidgetItem("#"+QString::number(orderObject->order_index)+orderObject->channelName);
     item0->setTextAlignment(Qt::AlignCenter);
     table->setItem(0, 0, item0);  // 渠道
-    QTableWidgetItem *item1 = new QTableWidgetItem(orderObject->order_id);
+    QTableWidgetItem *item1 = new QTableWidgetItem(orderObject->order_view_id.isEmpty()?orderObject->order_id:orderObject->order_view_id);
     item1->setTextAlignment(Qt::AlignCenter);
     table->setItem(0, 1, item1);  // 订单ID
     QTableWidgetItem *item2 = new QTableWidgetItem(Penny2Dollar(orderObject->product_fee));

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-03-28T09:41:44. -->
+<!-- Written by QtCreator 4.0.0, 2017-03-28T18:27:02. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>