1、修改商品汇总信息显示不正确问题 2、修改订单管理界面新订单按钮为接单 3、修改不展示状态为已拒绝的订单

takeout/main.cpp

@@ -25,6 +25,7 @@
 #include <QsLog.h>
 #include <QResource>
 #include <QSettings>
+#include <QSqlQuery>
 #include <QJsonObject>
 #include <Windows.h>
 
@@ -356,30 +357,6 @@ void ConfigToDB()
 
     QString filename = qApp->applicationDirPath() + "/" + PREINTER_CONSS;
 
-//    QString prttype = QSettings(filename, QSettings::IniFormat).value(INI_BASE_STOREID).toString();
-
-//    QString name = "";
-
-//    QLOG_DEBUG() << "--input--" << "name" << name << "";
-
-//    QString strtime = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
-
-//    if(_prttype == 0)
-//    {
-//        name = QString::fromUtf8("\xE5\xB0\x8F\xE7\xA5\xA8") + strtime;
-//    }
-//    else if(_prttype == 1)
-//    {
-//        name = QString::fromUtf8("\xE6\x9D\xAF\xE8\xB4\xB4") + strtime;
-//    }
-//    else if(_prttype == 2)
-//    {
-//        name = QString::fromUtf8("\xE5\x90\x8E\xE5\x8E\xA8") + strtime;
-//    }
-//    else
-//    {
-//        return ;
-//    }
     QString strtime = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
     QString prtId = QString::fromUtf8("\xE5\xB0\x8F\xE7\xA5\xA8") + strtime;
     QString prtName = QSettings(filename, QSettings::IniFormat).value(PRT_INI_NAME).toString();
@@ -411,6 +388,150 @@ void ConfigToDB()
         break;
     }
 
+    QString prtStr = QString(QJsonDocument(prtConfig).toJson());
+    QVariantMap map;
+    map.insert(DB_KEY_PRTID, prtId);
+    map.insert(DB_KEY_PRTNAME, prtName);
+    map.insert(DB_KEY_PRTTYPE, prtType);
+    map.insert(DB_KEY_PRTCONFIG, prtStr);
+
+    QSqlQuery query;
+
+    QStringList list;
+    list.append(EVENT_KEY_PRTID);
+
+    if(!db.find(DEFAULT_PRTFORM, query, list, QString(DB_KEY_PRTID).append("='%1'").arg(prtId)))
+        return ;
+
+    if(!query.next())
+    {
+        QLOG_DEBUG() << "insert new prt" << map;
+        bool flag = db.insert(DEFAULT_PRTFORM, map);
+        QLOG_DEBUG() << "insert new prt : " << prtId << "(" << flag << ")";
+    }
+    else
+    {
+        QLOG_DEBUG() << "update prt" << map;
+        bool flag = db.update(DEFAULT_PRTFORM, map, QString(DB_KEY_PRTID).append("='%1'").arg(prtId));
+        QLOG_DEBUG() << "update prt : " << prtId << "(" << flag << ")";
+    }
+
+    //判断配置文件中是否需要杯贴合后厨打印机字段，如果需要再将配置插入到数据库
+    // INI_NEEDLABEL INI_NEEDPTR
+    if(QSettings(filename, QSettings::IniFormat).value(INI_NEEDLABEL).toInt()) {
+        //杯贴配置写db
+        QString labelstrtime = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
+        QString labelprtId = QString::fromUtf8("\xE6\x9D\xAF\xE8\xB4\xB4") + labelstrtime;
+        QString labelprtName = QSettings(filename, QSettings::IniFormat).value(PRT_INI_PRINTLABEL).toString();
+        QString labelprtType = "1";                //小票打印机
+        QJsonObject labelprtConfig;
+        int labeltype = QSettings(filename, QSettings::IniFormat).value(PRT_INI_LABELPRTTYPE).toInt();
+        switch(labeltype) {
+        case 0:
+            break;
+        case 1:
+            break;
+        case 3:
+            break;
+        case 4:
+            labelprtConfig.insert(PRT_CONF_NAME, QSettings(filename, QSettings::IniFormat).value(PRT_INI_PRINTLABEL).toString());
+            labelprtConfig.insert(PRT_CONF_PAPERWIDTH, QSettings(filename, QSettings::IniFormat).value(PRT_INI_WIGTH).toString());
+            break;
+        default:
+            break;
+        }
+
+        QString labelprtStr = QString(QJsonDocument(labelprtConfig).toJson());
+        QVariantMap labelmap;
+        labelmap.insert(DB_KEY_PRTID, labelprtId);
+        labelmap.insert(DB_KEY_PRTNAME, labelprtName);
+        labelmap.insert(DB_KEY_PRTTYPE, labelprtType);
+        labelmap.insert(DB_KEY_PRTCONFIG, labelprtStr);
+
+        QSqlQuery labelquery;
+
+        QStringList labellist;
+        labellist.append(EVENT_KEY_PRTID);
+
+        if(!db.find(DEFAULT_PRTFORM, labelquery, labellist, QString(DB_KEY_PRTID).append("='%1'").arg(labelprtId)))
+            return ;
+
+        if(!labelquery.next())
+        {
+            QLOG_DEBUG() << "insert new prt" << labelmap;
+            bool flag = db.insert(DEFAULT_PRTFORM, labelmap);
+            QLOG_DEBUG() << "insert new prt : " << labelprtId << "(" << flag << ")";
+        }
+        else
+        {
+            QLOG_DEBUG() << "update prt" << labelmap;
+            bool flag = db.update(DEFAULT_PRTFORM, labelmap, QString(DB_KEY_PRTID).append("='%1'").arg(labelprtId));
+            QLOG_DEBUG() << "update prt : " << labelprtId << "(" << flag << ")";
+        }
+    }
+
+    if(QSettings(filename, QSettings::IniFormat).value(INI_NEEDPTR).toInt()) {
+        //杯贴配置写db
+        QString otherstrtime = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
+        QString otherprtId = QString::fromUtf8("\xE5\x90\x8E\xE5\x8E\xA8") + otherstrtime;
+        QString otherprtName = QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_NAME).toString();
+        QString otherprtType = "2";                //小票打印机
+        QJsonObject otherprtConfig;
+        int othertype = QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_TYPE).toInt();
+        switch(othertype) {
+        case 0:
+            otherprtConfig.insert(PRT_CONF_COM, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERCOMDEF_COM).toString());
+            otherprtConfig.insert(PRT_CONF_BAUDRATE, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERCOMDEF_BAUDRATE).toString());
+            otherprtConfig.insert(PRT_CONF_DATABITS, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERCOMDEF_DATABITS).toString());
+            otherprtConfig.insert(PRT_CONF_STOPBITS, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERCOMDEF_STOPBITS).toString());
+            otherprtConfig.insert(PRT_CONF_PARITY, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERCOMDEF_PARITY).toString());
+            otherprtConfig.insert(PRT_CONF_FLOWCONTROL, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERCOMDEF_FLOWCONTROL).toString());
+            break;
+        case 1:
+            otherprtConfig.insert(PRT_CONF_LPTNAME, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_PARALLEL).toString());
+            otherprtConfig.insert(PRT_CONF_PAPERWIDTH, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_PAPERWIDTH).toString());
+            break;
+        case 3:
+            otherprtConfig.insert(PRT_CONF_IP, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_IP).toString());
+            otherprtConfig.insert(PRT_CONF_PAPERWIDTH, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_PAPERWIDTH).toString());
+            break;
+        case 4:
+            otherprtConfig.insert(PRT_CONF_NAME, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_NAME).toString());
+            otherprtConfig.insert(PRT_CONF_PAPERWIDTH, QSettings(filename, QSettings::IniFormat).value(PRT_INI_OTHERPRT_PAPERWIDTH).toString());
+            break;
+        default:
+            break;
+        }
+
+        QString otherprtStr = QString(QJsonDocument(otherprtConfig).toJson());
+        QVariantMap othermap;
+        othermap.insert(DB_KEY_PRTID, otherprtId);
+        othermap.insert(DB_KEY_PRTNAME, otherprtName);
+        othermap.insert(DB_KEY_PRTTYPE, otherprtType);
+        othermap.insert(DB_KEY_PRTCONFIG, otherprtStr);
+
+        QSqlQuery otherquery;
+
+        QStringList otherlist;
+        otherlist.append(EVENT_KEY_PRTID);
+
+        if(!db.find(DEFAULT_PRTFORM, otherquery, otherlist, QString(DB_KEY_PRTID).append("='%1'").arg(otherprtId)))
+            return ;
+
+        if(!otherquery.next())
+        {
+            QLOG_DEBUG() << "insert new prt" << othermap;
+            bool flag = db.insert(DEFAULT_PRTFORM, othermap);
+            QLOG_DEBUG() << "insert new prt : " << otherprtId << "(" << flag << ")";
+        }
+        else
+        {
+            QLOG_DEBUG() << "update prt" << othermap;
+            bool flag = db.update(DEFAULT_PRTFORM, othermap, QString(DB_KEY_PRTID).append("='%1'").arg(otherprtId));
+            QLOG_DEBUG() << "update prt : " << otherprtId << "(" << flag << ")";
+        }
+    }
+
 
 }
 

takeout/view/newdetailform.cpp

@@ -191,7 +191,7 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
     }
 
     ui->product_numLb->setText(QString::number(orderObject->total_amount));
-    ui->product_price_Lb->setText(QString::number(orderObject->product_fee/100.0));
+    ui->product_price_Lb->setText(QString::number((orderObject->product_fee - orderObject->package_fee)/100.0));
 
     ui->package_price_Lb->setText(QString::number(orderObject->package_fee/100.0));
     ui->delivery_price_Lb->setText(QString::number(orderObject->send_fee/100.0));

takeout/view/newmainform.cpp

@@ -567,6 +567,9 @@ bool NewMainForm::event(QEvent *e)
         if(!PosOrderPool::GetOrderObject(orderid, order))
             return true;
 
+        if(order.status == RefusedOrder)
+            return true;
+
         Order_Index tmp = {order.status, order.refund_status};
         
         if(_order_indexs.contains(order.order_id))

takeout/view/orderoptform.cpp

@@ -98,7 +98,8 @@ bool OrderOptForm::getOrderOptAndName(int status, int order_type, QString &optna
     switch (status) {
     case NewOrder:
         optname = OPERATION_GETDELIVERS;
-        name = QString::fromUtf8("\xE5\x88\xB6\xE4\xBD\x9C");
+//        name = QString::fromUtf8("\xE5\x88\xB6\xE4\xBD\x9C");\xE6\x8E\xA5\xE5\x8D\x95
+        name = QString::fromUtf8("\xE6\x8E\xA5\xE5\x8D\x95");
         ui->btn_orderopt->setStyleSheet("#btn_orderopt{ background:rgba(25, 166, 119);border:1px solid rgb(25, 166, 119); }");
         return true;
     case FirmOrder: