1:修复小票平台序号BUG 2:将支付表的支付码和支付名称提取到配置文件

fmPlugin/fmPlugin.cpp

@@ -3,6 +3,10 @@
 #include <QtSql/QSqlQuery>
 #include <QVariant>
 #include <QDebug>
+#include <QCoreApplication>
+#include <QSettings>
+#include <QTextCodec>
+
 
 FmPlugin &FmPlugin::GetInstance()
 {
@@ -299,17 +303,29 @@ bool FmPlugin::_InsertInto_d_t_bill_fmpay0()
     query.prepare(queryInsert);
     query.bindValue(0, m_orderObject->order_id);
     query.bindValue(1, "01");
-    QString cpay_c, cpay_n;
+    QString cpay_c(""), cpay_n("");
     if(!m_orderObject->pay_type.compare("在线支付"))
     {
-        if(!m_orderObject->channel.compare("mtwm"))
-        {
-            cpay_c = QString("14");
-            cpay_n = QString("\347\276\216\345\233\242\345\244\226\345\215\226");//美团外卖
-        }else if(!m_orderObject->channel.compare("fmwd"))
+        //程序写死部分移到config文件PayInfo字段
+//        if(!m_orderObject->channel.compare("mtwm"))
+//        {
+//            cpay_c = QString("14");
+//            cpay_n = QString("\347\276\216\345\233\242\345\244\226\345\215\226");//美团外卖
+//        }else if(!m_orderObject->channel.compare("fmwd"))
+//        {
+//            cpay_c = QString("13");
+//            cpay_n = QString("\345\276\256\344\277\241\345\244\226\345\215\226");//微店外卖
+//        }
+        QString config = QString("%1/config.ini").arg(QCoreApplication::applicationDirPath());
+
+        QSettings settings(config, QSettings::IniFormat);
+        settings.setIniCodec(QTextCodec::codecForName("utf-8"));
+        QString strPayInfo = settings.value(QString("PayInfo/%1").arg(m_orderObject->channel)).toString();
+        QStringList info = strPayInfo.split('|');
+        if(info.count()==2)
         {
-            cpay_c = QString("13");
-            cpay_n = QString("\345\276\256\344\277\241\345\244\226\345\215\226");//微店外卖
+            cpay_c = info.at(0);
+            cpay_n = info.at(1);
         }
     }else
     {

fmPrinter/fmPrinter.cpp

@@ -80,7 +80,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
            }
        }
 
-       print = str_print.arg(v).arg(pData->channelName+"#"+pData->order_index).arg(pData->order_id).arg(pData->pay_type)
+       print = str_print.arg(v).arg(QString("%1##%2").arg(pData->channelName).arg(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)

fmTakeaway/Control/flowControl.cpp

@@ -140,6 +140,8 @@ bool FlowControl::_PullOrder()
                     //新数据
                     orderObject = new OrderObject(this);
                     orderObject->FromJson(jsonObject);
+                    //TODO
+                    orderObject->pay_type=QString("在线支付");
                     m_ordersMap.insert(orderObject->order_id, orderObject);
                     QLOG_INFO() << QString("new order[%1:%2].[data:%3]")
                                    .arg(orderObject->order_id, orderObject->status_desc)

fmTakeaway/DTools/configManger.h

@@ -71,6 +71,16 @@ public:
      * */
     int GetListenPort();
 
+    /* 功能:获取对应平台的入账支付Code和名称
+     * 参数:对应平台编号
+     * 返回:code,名称
+     * */
+    QString GetPayInfo(const QString& channel)
+    {
+        return m_config->value(QString("PayInfo/%1").arg(channel)).toString();
+    }
+
+
 private:
     ConfigManger();
     ConfigManger(ConfigManger const&);

run/config.ini

@@ -2,4 +2,14 @@
 url=http://wmpos.sandload.cn/api
 
 [RefundListener]
-port=34953
+port=34953
\ No newline at end of file
+
+;科脉支付表信息 平台编号=支付码|支付名称
+[PayInfo]
+bdwm=
+jdwm=
+mtwm=14|美团外卖
+eleme=19|饿了么外卖
+fmwd=13|微店外卖
+koubeiwaimai=
+sdg=
\ No newline at end of file