1. 新订单打印 2. 配置悬浮窗闪烁提示方式

component/process.cpp

@@ -64,8 +64,13 @@ QList<QVariantMap> Process::toDstFormat(QJsonDocument docSrc)
             else if(status == 1 || status == 2 || status == 4 || status == 6 || status == 200)
             {
                 dstMap.insert(QString("type"), QString("3"));
-                bodyMap.insert("amount", order["product_fee"].toInt());                             //明细金额
-                bodyMap.insert("pay", order["user_fee"].toInt() - order["send_fee"].toInt());       //用户实付金额-配送费
+//                说明：
+//                amount 明细金额，即所有商品price之和 + 打包费
+//                pay		用户实付金额-配送费 + 外卖平台承担的优惠金额
+                bodyMap.insert("amount", order["product_fee"].toInt());
+                bodyMap.insert("pay", order["user_fee"].toInt() -
+                        order["send_fee"].toInt() +
+                        order["dis_platform_fee"].toInt());
 
                 bodyMap.insert("source", order["channel"].toString() == "eleme" ? 1: 2);            //-- 1饿了么 2 美团
 
@@ -74,12 +79,28 @@ QList<QVariantMap> Process::toDstFormat(QJsonDocument docSrc)
                 {
                     QVariantMap product = variant.toMap();
                     QVariantMap item;
+
                     item.insert("code", product["pid"].toString());
-                    item.insert("num", product["product_amount"].toInt());
-                    item.insert("price", product["price"].toInt());
+                    if(!product["pid"].toString().trimmed().compare("011002"))      // 鲜奶小方商品特殊处理
+                    {
+                        item.insert("num", product["product_amount"].toInt()*2);
+                        item.insert("price", product["price"].toInt()/2);
+                    }
+                    else
+                    {
+                        item.insert("num", product["product_amount"].toInt());
+                        item.insert("price", product["price"].toInt());
+                    }
                     item.insert("memo", product["property_tags"].toString());
                     itemlist << item;
                 }
+                //  103015	外卖餐盒费
+                QVariantMap package_fee;
+                package_fee.insert("code", "103015");
+                package_fee.insert("num", 1);
+                package_fee.insert("price", 200);
+                package_fee.insert("memo", "餐盒费");
+                itemlist << package_fee;
                 QJsonDocument doc = QJsonDocument::fromVariant(itemlist);
                 bodyMap.insert("itemlist", doc.toVariant());
             }

fmTakeaway/floatform.cpp

@@ -66,7 +66,8 @@ void FloatForm::remind(const QString &operation)
             m_soundFile = QString("%1/wav/%2.wav").arg(g_appDir, operation);
             QSound::play(m_soundFile);
             m_remindIndex = 0;
-            m_remindTimer.start(8000);
+            if(!ConfigManage::Instance().bAlwaysBlink())
+                m_remindTimer.start(8000);
             m_animation.start();
         }
     }
@@ -76,6 +77,12 @@ void FloatForm::mousePressEvent(QMouseEvent *event)
 {
     m_bMouseMoved = false;
     m_lastMousePos = event->globalPos();
+    if( ConfigManage::Instance().bAlwaysBlink() &&
+            m_animation.state() == QAbstractAnimation::Running)
+    {
+        setWindowOpacity(1);
+        m_animation.stop();
+    }
 }
 
 void FloatForm::mouseMoveEvent(QMouseEvent *event)
@@ -99,3 +106,10 @@ void FloatForm::mouseReleaseEvent(QMouseEvent *event)
         qobject_cast<QWidget*>(parent())->show();
     }
 }
+
+void FloatForm::hide()
+{
+    if(m_animation.state() == QAbstractAnimation::Running)
+        m_animation.stop();
+    QDialog::hide();
+}

fmTakeaway/floatform.h

@@ -39,6 +39,9 @@ private:
     QTimer m_remindTimer;
     int m_remindIndex;
     QPropertyAnimation m_animation;
+
+public Q_SLOTS:
+    void hide();
 };
 
 #endif // FLOATFORM_H

fmTakeaway/mainwindow.cpp

@@ -4,11 +4,13 @@
 #include "flowControl.h"
 #include "util.h"
 #include "configManage.h"
+#include "printlib.h"
 #include "QsLog.h"
 
 #include <QDateTime>
 #include <QHBoxLayout>
 #include <QScrollBar>
+#include <QDir>
 
 #if _MSC_VER >= 1600
 #pragma execution_character_set("utf-8")
@@ -300,6 +302,53 @@ void MainWindow::_SetTablesSortEnable(bool bEnable)
     }
 }
 
+void MainWindow::_PrintNewOrder(OrderObject *orderObj)
+{
+    if( orderObj->status == 2)
+    {
+        if(! _IsPrinted(orderObj->order_id))
+        {
+            QFile file(QApplication::applicationDirPath() + "/print_configruation.txt");
+            if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+            {
+                QLOG_ERROR() << "read print configruation failed!";
+                return;
+            }
+            QString error;
+            PrintLib::GetInstance().DoPrint(QString::fromLocal8Bit(file.readAll()), orderObj, error);
+        }
+        else
+        {
+            QLOG_DEBUG() << orderObj->order_id << " printed.";
+        }
+    }
+}
+
+bool MainWindow::_IsPrinted(QString order_id)
+{
+    QString fileName = QCoreApplication::applicationDirPath() +
+            "/printer/" +
+            QDate::currentDate().toString("yyyy-MM-dd") +
+            "/printed.txt";
+    QFile file(fileName);
+    QDir().mkpath(QFileInfo(fileName).absolutePath());
+    if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
+    {
+       qDebug() << "read printed failed!";
+        return false;
+    }
+    QTextStream in(&file);
+    QString String = in.readLine();    //返回文件的一行，不包含换行符。
+    while(!String.isNull())
+    {
+        if(order_id == String)
+            return true;
+        String = in.readLine();
+    }
+    in << order_id << endl;
+    return false;
+}
+
 void MainWindow::onUpdateOrderDisplay(OrderObject *orderObj)
 {
     // 关闭排序否则插入数据会有问题
@@ -341,6 +390,7 @@ void MainWindow::onUpdateOrderDisplay(OrderObject *orderObj)
         }
     }
 
+    _PrintNewOrder(orderObj);
     // 插入订单
     orderObj->table = table;
     table->insertRow(0);

fmTakeaway/mainwindow.h

@@ -64,6 +64,13 @@ private:
      * */
     void _SetTablesSortEnable(bool bEnable);
 
+    /* 功能:打印新接单，检查是否打印过，没有的话进行打印
+     * 参数:
+     * 返回:NULL
+     * */
+    void _PrintNewOrder(OrderObject* orderObj);
+    bool _IsPrinted(QString order_id);
+
 private slots:
     /* 功能:响应按钮点击*/
     void onTabBtnClicked();

fmTakeaway/tools/configManage.h

@@ -19,6 +19,15 @@ public:
         return m_clientIni->value("client/bAutoConfirm").toBool()?1:0;
     }
 
+    /* 功能:获取是否悬浮窗一直闪烁
+     * 参数:NULL
+     * 返回:是否悬浮窗一直闪烁
+     * */
+    inline int bAlwaysBlink()
+    {
+        return m_clientIni->value("client/bAlwaysBlink").toBool()?1:0;
+    }
+
     /* 功能:获取是否有门店管理
      * 参数:NULL
      * 返回:是否有门店管理