1：入账新增打包费2：小票新增平台序号

fmPlugin/fmPlugin.cpp

@@ -269,6 +269,23 @@ bool FmPlugin::_InsertInto_d_t_food_fmbills0()
             return false;
         }
     }
+    // 单独增加餐盒费入账
+    if(m_orderObject->package_fee!=0)
+    {
+        query.bindValue(0, m_orderObject->order_id);
+        query.bindValue(1, QString("%1").arg(QString::number(m_orderObject->proList.count()+1),4,QChar('0')));
+        query.bindValue(2, "1510000999");
+        query.bindValue(3, QString("餐盒费"));
+        query.bindValue(4, "1");
+        query.bindValue(5, _Penny2Dollar(m_orderObject->package_fee));
+        query.bindValue(6, _Penny2Dollar(m_orderObject->package_fee));
+        if(!query.exec())
+        {
+            m_lastError = query.lastError().text();
+            return false;
+        }
+    }
+
     return true;
 }
 

fmPlugin/fmPlugin.pro

@@ -26,3 +26,5 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+
+DESTDIR += ../laoxj

fmPrinter/fmPrinter.cpp

@@ -32,14 +32,22 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     if( !file.open( QFile::ReadOnly)){
         return QString("无法打开printformat.txt!");
     }
+    QString name, price;
     for(int i=0; i<pData->proList.count(); i++)
     {
-        QString name, price;
         name = pData->proList[i]->name;
         price = QString("\r\n       x%1  %2  %4\r\n").arg(pData->proList[i]->productAmount).arg(_Penny2Dollar(pData->proList[i]->price))
                 .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
         str_comd_list.append(QString(name+price));
     }
+    // 打印餐盒费
+    if(pData->package_fee!=0)
+    {
+        name =  QString("餐盒费");
+        price = QString("\r\n       x%1  %2  %4\r\n").arg("1").arg(_Penny2Dollar(pData->package_fee))
+                .arg(_Penny2Dollar(pData->package_fee));
+        str_comd_list.append(QString(name+price));
+    }
 
     QByteArray array = file.readAll();
     str_print = QString::fromUtf8(array);
@@ -72,7 +80,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
            }
        }
 
-       print = str_print.arg(v).arg(pData->channelName).arg(pData->order_id).arg(pData->pay_type)
+       print = str_print.arg(v).arg(pData->channelName+"#"+pData->order_index).arg(pData->order_id).arg(pData->pay_type)
                .arg(pData->customer).arg(pData->phone).arg(pData->address.replace("埇","Yong")).arg(str_comd_list)
                .arg(_Penny2Dollar(pData->total_fee-pData->send_fee)).arg(_Penny2Dollar(pData->discount_fee)).arg(_Penny2Dollar(pData->send_fee)).arg(pData->total_amount)
                .arg(fee).arg(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm")).arg(pData->remark).arg(pData->courier_name).arg(pData->courier_phone)

fmPrinter/fmPrinter.pro

@@ -26,3 +26,5 @@ unix {
 }
 
 LIBS += -lWinspool
+
+DESTDIR += ../laoxj

fmTakeaway/Model/orderObject.cpp

@@ -28,6 +28,16 @@ void OrderObject::setstatus(const int &v)
     status = v;
 }
 
+int OrderObject::getpackage_fee() const
+{
+    return package_fee;
+}
+
+void OrderObject::setpackage_fee(const int &v)
+{
+    package_fee = v;
+}
+
 QString OrderObject::getChannel() const
 {
     return channel;

fmTakeaway/Model/orderObject.h

@@ -52,6 +52,7 @@ public:
     Q_PROPERTY (int delivery_status READ getdelivery_status WRITE setdelivery_status)
     Q_PROPERTY (QString fm_id READ getfm_id WRITE setfm_id)
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
+    Q_PROPERTY (int package_fee READ getpackage_fee WRITE setpackage_fee)
 
     QString address;         //地址
     QString channel;         //渠道
@@ -89,10 +90,13 @@ public:
     int total_amount;        //总件数
     int user_fee;            //应付金额
     QStringList records;         //订单操作记录
+    int package_fee;        //打包费
 
 protected:
     int getstatus() const ;
     void setstatus(const int& v);
+    int getpackage_fee() const ;
+    void setpackage_fee(const int& v);
     QString getChannel() const ;
     void setChannel(const QString& v);
     QString getchannelName() const ;

fmTakeaway/detailForm.cpp

@@ -76,7 +76,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     QFile orderFlag(QString("%1/orders/%2").arg(QApplication::applicationDirPath(), orderObject->order_id));
     if(!orderFlag.exists())
     {
-        ui->detailBtn0->hide();
+    //    ui->detailBtn0->hide();
     }
 
     ui->detailBtn2->setProperty("operation", OPERATION_REFUSE);

fmTakeaway/fmTakeaway.pro

@@ -80,9 +80,8 @@ FORMS    += mainForm.ui \
 RC_FILE += fmTakeaway.rc
 
 CONFIG(release, debug|release) {
-    LIBS += -L../fmPlugin/release -lfmPlugin
-    LIBS += -L../fmPrinter/release -lfmPrinter
-} else {
-    LIBS += -L../fmPlugin/debug -lfmPlugin
-    LIBS += -L../fmPrinter/debug -lfmPrinter
+    LIBS += -L../laoxj -lfmPlugin
+    LIBS += -L../laoxj -lfmPrinter
 }
+
+DESTDIR += ../laoxj

run/config.ini

 [FmServer]
-url=http://waimaiapi.freemudorder.com/api
+url=http://wmpos.sandload.cn/api
 
 [RefundListener]
 port=34953
\ No newline at end of file