1.SaaS发布版本，调整打印格式，界面优惠金额展示等

takeout/base/Print/printlib.cpp

@@ -6,9 +6,12 @@
 #include <QSettings>
 #include <QDateTime>
 #include <QStringList>
+#include <QsLog.h>
+
 
 PrintLib::PrintLib()
 {
+    m_b_load_sucfl =false;
     m_print_lib.setFileName("fmposdll.dll");
     if(m_print_lib.load())
     {
@@ -67,9 +70,11 @@ bool PrintLib::DoPrint(const QByteArray &content, OrderObject *orderObject, QStr
 
 bool PrintLib::DoPrint(const QString &content, OrderObject *orderObject, QString &error)
 {
+
     QByteArray iniData = _GetPrintIni().toLocal8Bit();
     char inichar[2048]={0x0};
     strcpy(inichar,iniData.data());
+    QLOG_INFO() << "4444444444444444444" << m_b_load_sucfl;
     if(m_b_load_sucfl)
     {
         if(!f_LaodAddress())
@@ -83,6 +88,7 @@ bool PrintLib::DoPrint(const QString &content, OrderObject *orderObject, QString
             return false;
         }
         _order = orderObject;
+        QLOG_INFO() << "55555555555555555555" << _order->delivery_time;
         bool result;
         PrintDocument doc = PrintDocument::ParseToDocument(content, result,error);
         if(!result)
@@ -208,7 +214,13 @@ void PrintLib::_PrintLine(const LineNode &line, ProductObject *dish)
             }
             if(time)
             {
-                text.replace(index,QDateTime::fromTime_t(v.toInt()).toString("yyyy-MM-dd hh:mm"));
+                int delivertime = v.toInt();
+                if(delivertime == 0)
+                {
+                    text.replace(index,QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm"));
+                }else{
+                    text.replace(index,QDateTime::fromTime_t(v.toInt()).toString("yyyy-MM-dd hh:mm"));
+                }
             }else
             {
                 text.replace(index,v.toString());

takeout/control/ordergetwork.cpp

@@ -705,7 +705,7 @@ void OrderGetWork::optOrder(const QJsonArray &orders)
         OrderObject orderObject;
         orderObject.FromJson(jsonObject);
 
-        QLOG_INFO() << "----------------------------:" << &jsonObject;
+        QLOG_INFO() << "----------------------------:" << orderObject.delivery_time;
 
         //PosOrderPool::TryInsertOrder(orderObject);
         POSTEVENTTYPE(PosEvent::s_inset_orderpool,orderObject,OrderObject);

takeout/control/ordergetwork.h

@@ -132,7 +132,8 @@ private:
         data.insert(JSON_DEVICEID, json[JSON_STATIONID].toString());
         data.insert(JSON_KEY_USERID, json[JSON_KEY_USERID].toString());
         data.insert(JSON_KEY_PWD, json[JSON_KEY_PWD].toString());
-        data.insert(JSON_KEY_PARTNERID, json[JSON_KEY_PARTNERID].toInt());
+        //data.insert(JSON_KEY_PARTNERID, json[JSON_KEY_PARTNERID].toInt());
+        data.insert(JSON_KEY_PARTNERID, json[JSON_KEY_PARTNERID].toString());
 
         return true;
     }
@@ -163,7 +164,8 @@ private:
 
         data.insert(JSON_STOREID, json[JSON_STOREID].toString());
         data.insert(JSON_DEVICEID, json[JSON_STATIONID].toString());
-        data.insert(JSON_KEY_PARTNERID, json[JSON_KEY_PARTNERID].toInt());
+        //data.insert(JSON_KEY_PARTNERID, json[JSON_KEY_PARTNERID].toInt());
+        data.insert(JSON_KEY_PARTNERID, json[JSON_KEY_PARTNERID].toString());
         data.insert(JSON_KEY_APPVER, DEFAULT_APP_VER);
         data.insert(JSON_KEY_SYSTEMVER, DEFAULT_SYSTEM_VER);
 
@@ -337,9 +339,15 @@ private:
 
     static void getTimestamp(const QJsonObject &json, QString &timestamp)
     {
+        QString tmps;
+
+        tmps.clear();
+
         if(json.contains(JSON_KEY_RESULT) && json[JSON_KEY_RESULT].isObject() &&
                 json[JSON_KEY_RESULT].toObject().contains(JSON_KEY_TIMESTAMP))
-            timestamp = json[JSON_KEY_RESULT].toObject()[JSON_KEY_TIMESTAMP].toString();
+            tmps = json[JSON_KEY_RESULT].toObject()[JSON_KEY_TIMESTAMP].toString();
+        if(!tmps.isEmpty())
+            timestamp = tmps;
     }
 
     static bool checkStatusCode(const QJsonObject &json, QString &error)

takeout/control/orderpushwork.cpp

@@ -289,6 +289,8 @@ bool OrderPushWork::GetServiceList()
         return false;
     }
 
+    QLOG_DEBUG() << "_serurl : " << _serurl;
+
     QJsonObject json;
 
     json.insert(JSON_KEY_PUSH_PARTNERID, _storeinfo[JSON_KEY_PARTNERID].toString());

takeout/main.cpp

@@ -187,6 +187,9 @@ int main(int argc, char *argv[])
     //QObject::connect(&floatform, &FloatForm::showMainForm, &mainform, &MainForm::show);
 
     QObject::connect(&loginform, &LoginForm::showmainform, &mainform, &MainForm::showFullScreen);
+
+    //QObject::connect(&loginform, &LoginForm::showmainform, &mainform, &MainForm::show);
+
     QObject::connect(&loginform, &LoginForm::showfloat, &floatform, &FloatForm::onShow);
     QObject::connect(&floatform, &FloatForm::showMainForm, &loginform, &LoginForm::showfull);
 

takeout/model/baseObject.cpp

@@ -2,6 +2,7 @@
 #include <QStringList>
 #include <QVariant>
 #include "preDefine.h"
+#include <QDateTime>
 
 BaseObject::BaseObject(const BaseObject &p, QObject *parent):QObject(parent)
 {
@@ -35,6 +36,16 @@ void BaseObject::FetchDataFromJson(const QJsonObject &json)
     foreach(QString key, keys)
     {
         setProperty(key.toUtf8(), json[key].toVariant());
+
+        //对服务端传过来的delivery_time进行解析，如果为0表示为“我已到店”，则将送达时间改为当前时间
+        if(key == JSON_KEY_DELIVERTIME)
+        {
+            if(json[JSON_KEY_DELIVERTIME].toInt() == 0)
+            {
+               setProperty(key.toUtf8(), (int)QDateTime::currentDateTime().toTime_t());
+            }
+        }
+
     }
 
     return;

takeout/model/discountObject.cpp

+#include "discountObject.h"
+
+QString DiscountObject::getName() const
+{
+    return name;
+}
+
+void DiscountObject::setName(const QString &value)
+{
+    name = value;
+}
+
+QString DiscountObject::getAccountId() const
+{
+    return accountId;
+}
+
+void DiscountObject::setAccountId(const QString &value)
+{
+    accountId = value;
+}
+
+int DiscountObject::getNumber() const
+{
+    return number;
+}
+
+void DiscountObject::setNumber(int value)
+{
+    number = value;
+}
+
+QString DiscountObject::getOaid() const
+{
+    return oaid;
+}
+
+void DiscountObject::setOaid(const QString &value)
+{
+    oaid = value;
+}
+
+QString DiscountObject::getOrderId() const
+{
+    return orderId;
+}
+
+void DiscountObject::setOrderId(const QString &value)
+{
+    orderId = value;
+}
+
+int DiscountObject::getSequence() const
+{
+    return sequence;
+}
+
+void DiscountObject::setSequence(int value)
+{
+    sequence = value;
+}
+
+int DiscountObject::getType() const
+{
+    return type;
+}
+
+void DiscountObject::setType(int value)
+{
+    type = value;
+}
+
+DiscountObject::DiscountObject(const DiscountObject &d, QObject *parent):BaseObject(parent)
+{
+    const QMetaObject *m = d.metaObject();
+    for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
+    {
+        QMetaProperty qmp = m->property(i);
+        QString key = QString::fromLatin1(qmp.name());
+        QVariant value = d.property(key.toUtf8());
+        this->setProperty(key.toUtf8(), value);
+    }
+}
+
+DiscountObject &DiscountObject::operator =(const DiscountObject &d)
+{
+    const QMetaObject *m = d.metaObject();
+    for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
+    {
+        QMetaProperty qmp = m->property(i);
+        QString key = QString::fromLatin1(qmp.name());
+        QVariant value = d.property(key.toUtf8());
+        this->setProperty(key.toUtf8(), value);
+    }
+    return *this;
+}
+
+void DiscountObject::FromJson(const QJsonObject &json)
+{
+    price = 0;
+    FetchDataFromJson(json);
+}
+
+int DiscountObject::getPrice() const
+{
+    return price;
+}
+
+void DiscountObject::setPrice(int value)
+{
+    price = value;
+}

takeout/model/discountObject.h

+#ifndef DISCOUNTOBJECT_H
+#define DISCOUNTOBJECT_H
+
+#include "baseObject.h"
+
+class DiscountObject : public BaseObject
+{
+    Q_OBJECT
+public:  
+    DiscountObject(QObject *parent=0)
+        :BaseObject(parent){price = 0;}
+    DiscountObject(const DiscountObject& d,QObject *parent=0);
+    DiscountObject &operator =(const DiscountObject& d);
+    void FromJson(const QJsonObject& json);
+
+    Q_PROPERTY (int price READ getPrice WRITE setPrice)
+    Q_PROPERTY (QString name READ getName WRITE setName)
+    Q_PROPERTY (QString accountId READ getAccountId WRITE setAccountId)
+    Q_PROPERTY (int number READ getNumber WRITE setNumber)
+    Q_PROPERTY (QString oaid READ getOaid WRITE setOaid)
+    Q_PROPERTY (QString orderId READ getOrderId WRITE setOrderId)
+    Q_PROPERTY (int sequence READ getSequence WRITE setSequence)
+    Q_PROPERTY (int type READ getType WRITE setType)
+
+    int price;
+    QString name;
+    QString accountId;
+    int number;
+    QString oaid;
+    QString orderId;
+    int sequence;
+    int type;
+
+    int getPrice() const;
+    void setPrice(int value);
+    QString getName() const;
+    void setName(const QString &value);
+    QString getAccountId() const;
+    void setAccountId(const QString &value);
+    int getNumber() const;
+    void setNumber(int value);
+    QString getOaid() const;
+    void setOaid(const QString &value);
+    QString getOrderId() const;
+    void setOrderId(const QString &value);
+    int getSequence() const;
+    void setSequence(int value);
+    int getType() const;
+    void setType(int value);
+};
+
+#endif // DISCOUNTS_H

takeout/model/orderObject.cpp

 #include "orderObject.h"
 #include "preDefine.h"
 #include <QJsonArray>
+#include <QDateTime>
+#include "QsLog.h"
 
 OrderObject::OrderObject(const OrderObject &p, QObject *parent):BaseObject(parent)
 {
     qDeleteAll(proList);
     proList.clear();
+
+    qDeleteAll(disList);
+    disList.clear();
+
     const QMetaObject *m = p.metaObject();
     for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
     {
@@ -19,6 +25,11 @@ OrderObject::OrderObject(const OrderObject &p, QObject *parent):BaseObject(paren
         this->proList.append(product);
     }
 
+    foreach (auto ptr, p.disList) {
+        DiscountObject *dis=new DiscountObject(*ptr,this);
+        this->disList.append(dis);
+    }
+
     if(this->refund_status == 0)
         this->refund_status = -100;
 }
@@ -27,6 +38,10 @@ OrderObject &OrderObject::operator =(const OrderObject &p)
 {
     qDeleteAll(proList);
     proList.clear();
+
+    qDeleteAll(disList);
+    disList.clear();
+
     const QMetaObject *m = p.metaObject();
     for( int i=m->propertyOffset(); i<m->propertyCount(); i++)
     {
@@ -40,6 +55,11 @@ OrderObject &OrderObject::operator =(const OrderObject &p)
         this->proList.append(product);
     }
 
+    foreach (auto ptr, p.disList) {
+        DiscountObject *dis=new DiscountObject(*ptr,this);
+        this->disList.append(dis);
+    }
+
     if(this->refund_status == 0)
         this->refund_status = -100;
 
@@ -48,9 +68,16 @@ OrderObject &OrderObject::operator =(const OrderObject &p)
 
 void OrderObject::FromJson(const QJsonObject &json)
 {
+    tmp_total = "0.00";
+
     qDeleteAll(proList);
     proList.clear();
+
+    qDeleteAll(disList);
+    disList.clear();
+
     FetchDataFromJson(json);
+
     QJsonArray products = json[JSON_PRODUCTS].toArray();
     foreach(QJsonValue product, products)
     {
@@ -60,12 +87,41 @@ void OrderObject::FromJson(const QJsonObject &json)
         proList.append(proObject);
     }
 
+    QJsonArray diss = json[JSON_KEY_DISCOUNTS].toArray();
+
+    if(diss.size() > 0 && diss[0].toObject().contains(JSON_KEY_PRICE))
+        tmp_total = QString::number((-(diss[0].toObject()[JSON_KEY_PRICE].toInt())));
+
+    foreach(QJsonValue disduct, diss)
+    {
+        QJsonObject disJson = disduct.toObject();
+        DiscountObject *disObject = new DiscountObject(this);
+        disObject->FromJson(disJson);
+        disList.append(disObject);
+    }
+
+
+    if(json[JSON_KEY_DELIVERTIME].toInt()==0){
+        this->delivery_time = (int)QDateTime::currentDateTime().toTime_t();
+    }
+
+
     if(this->refund_status == 0)
         this->refund_status = -100;
 
     return;
 }
 
+QString OrderObject::getTmp_total() const
+{
+    return tmp_total;
+}
+
+void OrderObject::setTmp_total(const QString &value)
+{
+    tmp_total = value;
+}
+
 int OrderObject::getrefund_status() const
 {
     return refund_status;

takeout/model/orderObject.h

@@ -2,6 +2,7 @@
 #define ORDEROBJECT_H
 
 #include "productObject.h"
+#include "discountObject.h"
 
 class OrderObject : public BaseObject
 {
@@ -20,6 +21,7 @@ public:
     void FromJson(const QJsonObject& json);
 
 public:
+    Q_PROPERTY (QString tmp_total READ getTmp_total WRITE setTmp_total)
     Q_PROPERTY (QString channel READ getChannel WRITE setChannel)
     Q_PROPERTY (QString channel_name READ getchannelName WRITE setchannelName)
     Q_PROPERTY (QString phone READ getphone WRITE setphone)
@@ -100,6 +102,7 @@ public:
     QString phone;           //电话
     QString posorder_id;     //pos订单号
     QString printcfg;        //打印联
+    QList<DiscountObject *> disList; //优惠明细
     QList<ProductObject *> proList; //商品明细
     int paid_fee;            //已付金额
     QString remark;          //备注
@@ -114,6 +117,7 @@ public:
     int total_amount;        //总件数
     int user_fee;            //应付金额
     QStringList records;         //订单操作记
+    QString tmp_total;      //临时订单优惠专属
 
 protected:
     QString getcustomer_code() const{
@@ -122,6 +126,10 @@ protected:
     void setcustomer_code(const QString & v){
         customer_code = v;
     }
+
+    QString getTmp_total() const;
+    void setTmp_total(const QString &value);
+
     int getrefund_status() const;
     void setrefund_status(const int& v);
     int getservice_fee() const ;

takeout/preDefine.h

@@ -14,8 +14,12 @@
 #define DEFAULT_DBNAME              "order.db"
 #define DEFAULT_DBFORM              "orderlist"
 
-#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-#define DEFAULT_ACCESS_TOKEN        "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
+//#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+//#define DEFAULT_ACCESS_TOKEN        "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
+
+//正式环境
+#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
 
 #define TIMEOUT_TRY_LOGING          20000
 #define TIMEOUT_TRY_PULLORDER       60000
@@ -75,11 +79,14 @@
 #define JSON_MESSAGE            "msg"
 #define JSON_DAILYSUMMARYS      "daily_summarys"
 #define JSON_TIMESTAMPS         "timestamp"
+#define JSON_KEY_PRICE          "price"
 #define JSON_AUTOCONFIRM        "autoconfirm"
 #define JSON_TOKEN              "token"
 #define JSON_POSVERSION         "pos_version"
 #define JSON_ORDERS             "orders"
 #define JSON_PRODUCTS           "products"
+#define JSON_KEY_DISCOUNTS      "discounts"
+#define JSON_KEY_DELIVERTIME    "delivery_time"
 #define JSON_ORDERID            "order_id"
 #define JSON_REASON             "reason"
 #define JSON_REASONCODE         "reason_code"

takeout/takeout.pro

@@ -55,7 +55,8 @@ SOURCES += main.cpp \
     base/DB/fm_database.cpp \
     control/orderlocalizework.cpp \
     control/orderprintwork.cpp \
-    view/loginform.cpp
+    view/loginform.cpp \
+    model/discountObject.cpp
 
 HEADERS  += \
     event/fmapplication.h \
@@ -89,7 +90,8 @@ HEADERS  += \
     base/DB/fm_database.h \
     control/orderlocalizework.h \
     control/orderprintwork.h \
-    view/loginform.h
+    view/loginform.h \
+    model/discountObject.h
 
 DISTFILES += takeout.rc
 

takeout/takeout.rc

@@ -4,8 +4,8 @@
 #include <winver.h>
 #endif
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 1,0,0,6
-    PRODUCTVERSION 1,0,0,6
+    FILEVERSION 1,0,0,7
+    PRODUCTVERSION 1,0,0,7
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
     FILEFLAGS VS_FF_DEBUG
@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
             BEGIN
                 VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
                 VALUE "FileDescription", "FREEMUD Manager System"
-                VALUE "FileVersion", "1.0.0.6"
+                VALUE "FileVersion", "1.0.0.7"
                 VALUE "InternalName", "FREEMUD"
                 VALUE "LegalCopyright", "Copyright (C)2017-2020"
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "fmTakeout"
-                VALUE "ProductVersion", "1.0.0.6"
+                VALUE "ProductVersion", "1.0.0.7"
             END
         END
         BLOCK "VarFileInfo"

takeout/view/clickedLineEdit.h

@@ -17,8 +17,9 @@ protected:
         if (event->button()==Qt::LeftButton)//拦截点击左键动作
         {
             emit clicked();
-            event->accept();//默认处理过程
+            //event->accept();//默认处理过程
         }
+        QLineEdit::mouseMoveEvent(event);
     }
 
 signals:

takeout/view/detailForm.cpp

@@ -54,8 +54,13 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab4->setText(QString::fromLocal8Bit("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party,
                                                                  Penny2Dollar(orderObject->send_fee)));
     ui->detailLab5->setText(orderObject->delivery_time==0? QString::fromLocal8Bit("立即送出") : QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm"));
-    ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? QString::fromLocal8Bit("暂未指定") : QString::fromLocal8Bit("[姓名]%1 [电话]%2")
-                                                                            .arg(orderObject->courier_name, orderObject->courier_phone));
+//    ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? QString::fromLocal8Bit("暂未指定") : QString::fromLocal8Bit("[姓名]%1 [电话]%2")
+//                                                                            .arg(orderObject->courier_name, orderObject->courier_phone));
+    if(orderObject->disList.size() > 0)
+        ui->detailLab6->setText(QString::number((-orderObject->disList[0]->price)/100.0, 'f' , 2).append(QString::fromLocal8Bit("(元)")));
+    else
+        ui->detailLab6->setText("0");
+
     ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));
     ui->detailLab8->setText(orderObject->has_invoiced? QString::fromLocal8Bit("发票抬头:%1").arg(orderObject->invoice_title) : QString::fromLocal8Bit("不需要发票"));
 

takeout/view/detailForm.ui

@@ -684,7 +684,7 @@
             </size>
            </property>
            <property name="text">
-            <string>送餐员:</string>
+            <string>优惠金额:</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>

takeout/view/loginform.cpp

@@ -82,6 +82,7 @@ void LoginForm::showfull()
 //        ui->lineEdit_partnerid->clear();
 //        ui->lineEdit_pwd->clear();
         this->showFullScreen();
+        //this->show();
         return ;
     }
 
@@ -161,9 +162,17 @@ void LoginForm::on_pushButton_login_clicked()
         return ;
     }
 
+    //可能调整
+//    map.insert(JSON_STOREID, "1036");
+//    map.insert(JSON_STATIONID, "saas_bf_pos");
+
+    map.insert(JSON_STOREID, "fm10001");
+    map.insert(JSON_STATIONID, "1001");
+
+    //map.insert(JSON_STOREID, "FM00001");
+    //map.insert(JSON_STATIONID, "saas_pos");
+    //map.insert(JSON_STATIONID, "FM00001");
 
-    map.insert(JSON_STOREID, "1036");
-    map.insert(JSON_STATIONID, "saas_bf_pos");
     map.insert(JSON_KEY_USERID, ui->lineEdit_account->text());
     map.insert(JSON_KEY_PWD, ui->lineEdit_pwd->text());
     map.insert(JSON_KEY_PARTNERID, ui->lineEdit_partnerid->text());

takeout/view/loginform.ui

@@ -363,7 +363,7 @@
                  </size>
                 </property>
                 <property name="text">
-                 <string>1585</string>
+                 <string>1794</string>
                 </property>
                 <property name="echoMode">
                  <enum>QLineEdit::Normal</enum>
@@ -415,7 +415,7 @@
                  </size>
                 </property>
                 <property name="text">
-                 <string>beiguo_saas</string>
+                 <string>1001</string>
                 </property>
                </widget>
               </item>
@@ -464,7 +464,7 @@
                  </size>
                 </property>
                 <property name="text">
-                 <string>beiguo_saas</string>
+                 <string>1001</string>
                 </property>
                 <property name="echoMode">
                  <enum>QLineEdit::Password</enum>

takeout/view/mainForm.cpp

@@ -10,6 +10,9 @@
 #include <QProcess>
 #include <QThread>
 #include <QDateTime>
+
+#include <QDesktopWidget>
+
 #include "base/Config/configManger.h"
 #include "event/posevent.h"
 #include "event/fmapplication.h"