入账方式及编码在配置文件中读取

fmPlugin/fmPlugin.cpp

@@ -379,11 +379,29 @@ QString FmPlugin::_GetOrderStr( const OrderObject *orderObject)
     rObj.insert("PluDetails", products);
 
     QJsonArray payDetails;
+    QString zfCode = "001";
+    QString zfName = "非码外卖";
+
+    QSettings set(QString("%1/config.ini").arg(QCoreApplication::applicationDirPath()), QSettings::IniFormat);
+    set.setIniCodec("utf-8");
+    if(orderObject->pay == 1)
+    {
+        zfCode = set.value(QString("payDetails/cash")).toString();
+        zfName = "现金";
+    }else
+    {
+        QStringList values  = set.value(QString("payDetails/%1").arg(orderObject->channel)).toString().split('|');
+        if(values.count()==2)
+        {
+            zfCode = values.at(0);
+            zfName = values.at(1);
+        }
+    }
 
     QJsonObject tObj;
     tObj.insert("SerialNo", 1);
-    tObj.insert("ZfCode", "001");
-    tObj.insert("ZfName", "非码外卖");
+    tObj.insert("ZfCode", zfCode);
+    tObj.insert("ZfName", zfName);
     tObj.insert("ZfTotal", QString::number(YsTotal,'f',2));
     tObj.insert("TradeNo", "");
     payDetails.insert(0, tObj);

fmTakeaway/Model/orderObject.cpp

@@ -19,6 +19,16 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+int OrderObject::getpay() const
+{
+    return pay;
+}
+
+void OrderObject::setpay(const int &v)
+{
+    pay = v;
+}
+
 int OrderObject::getproduct_fee() const
 {
     return product_fee;

fmTakeaway/Model/orderObject.h

@@ -56,6 +56,7 @@ public:
     Q_PROPERTY (int service_fee READ getservice_fee WRITE setservice_fee)
 
     Q_PROPERTY (int product_fee READ getproduct_fee WRITE setproduct_fee)
+    Q_PROPERTY (int pay READ getpay WRITE setpay)
 
     QString address;         //地址
     QString channel;         //渠道
@@ -98,7 +99,12 @@ public:
     int service_fee;        //外卖平台服务费
     int product_fee;        //商品总价
 
+    int pay;
+
 protected:
+    int getpay() const;
+    void setpay(const int& v);
+
     int getproduct_fee() const;
     void setproduct_fee(const int& v);
     int getdis_shop_fee() const;

fmTakeaway/fmTakeaway.pro

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

fmTakeaway/preDefine.h

@@ -6,7 +6,8 @@
 #define APP_THEME               "deaufult"
 #define APP_VERSION             "1.20160923.01"     //TODO
 
-#define SERVER_PASSWORD         "pos@freemud.cn"
+//#define SERVER_PASSWORD         "pos@freemud.cn"
+#define SERVER_PASSWORD         "posoperator@freemud.cn"
 
 #define CONFIG_NAME             "config.ini"
 #define USERCONFIG_NAME         "userConfig.ini"

run/config.ini

@@ -3,3 +3,9 @@ url=http://waimaiapi.freemudorder.com/api
 
 [RefundListener]
 port=34953
+
+;支付编码和名称
+;格式为 平台代号=支付编码,支付名称
+[payDetails]
+cash=001
+eleme=002,饿了么