1.记录绑定商户号门店号和POS编号,不同门店登录自动重新绑定;2.记录门店电话号码并添加到订单信息中;

takeout/control/ordergetwork.cpp

@@ -433,6 +433,16 @@ bool OrderGetWork::loginToServer(QString &error)
         return false;
     }
 
+    if(recvjson.contains(LOGIN_RESULT) && recvjson[LOGIN_RESULT].isObject() &&
+            recvjson[LOGIN_RESULT].toObject().contains(LOGIN_STORE_NAME) && recvjson[LOGIN_RESULT].toObject()[LOGIN_STORE_NAME].isString())
+        _storeinfo.insert(LOGIN_STORE_NAME, recvjson[LOGIN_RESULT].toObject()[LOGIN_STORE_NAME].toString());
+
+    if(recvjson.contains(LOGIN_RESULT) && recvjson[LOGIN_RESULT].isObject() &&
+            recvjson[LOGIN_RESULT].toObject().contains(LOGIN_STORE_PHONE) && recvjson[LOGIN_RESULT].toObject()[LOGIN_STORE_PHONE].isString())
+        _storeinfo.insert(LOGIN_STORE_PHONE, recvjson[LOGIN_RESULT].toObject()[LOGIN_STORE_PHONE].toString());
+
+    QLOG_DEBUG() << "^^^:" << _storeinfo;
+
     _islogin = true;
 
     OrderGetDataProcess::setToken(recvjson, _token);
@@ -491,7 +501,7 @@ bool OrderGetWork::bingToServer(QString &error)
         return false;
     }
 
-    OrderGetDataProcess::setBind();
+    OrderGetDataProcess::setBind(_storeinfo);
 
     QLOG_INFO() << "bind success";
 
@@ -673,7 +683,7 @@ void OrderGetWork::login()
 
     do
     {
-        if(!OrderGetDataProcess::isBind())
+        if(!OrderGetDataProcess::isBind(_storeinfo))
         {
             if(!bingToServer(error))
             {
@@ -700,7 +710,7 @@ void OrderGetWork::loginStart()
 
     do
     {
-        if(!OrderGetDataProcess::isBind())
+        if(!OrderGetDataProcess::isBind(_storeinfo))
         {
             QVariantMap tmpmap;
             tmpmap.insert(EVENT_KEY_ORDERSTATUS, 0);
@@ -755,8 +765,12 @@ void OrderGetWork::optOrder(const QJsonArray &orders)
     {
         QJsonObject jsonObject = order.toObject();
         OrderObject orderObject;
+
         orderObject.FromJson(jsonObject);
 
+        if(_storeinfo.contains(LOGIN_STORE_PHONE))
+            orderObject.setStore_phone(_storeinfo[LOGIN_STORE_PHONE].toString());
+
         QLOG_INFO() << "----------------------------:" << orderObject.delivery_time;
 
         //PosOrderPool::TryInsertOrder(orderObject);

takeout/control/ordergetwork.h

@@ -111,21 +111,63 @@ public:
     friend class OrderGetWork;
 private:
 
-    static bool isBind()
+    static bool isBind(QVariantMap storeinfo)
     {
+        if(storeinfo.isEmpty())
+            return false;
+
+        if(storeinfo.contains(JSON_KEY_PARTNERID) && storeinfo.contains(JSON_STOREID) && storeinfo.contains(JSON_STATIONID))
+        {
+            QString partnerid = storeinfo[JSON_KEY_PARTNERID].toString();
+            QString storeid = storeinfo[JSON_STOREID].toString();
+            QString stationid = storeinfo[JSON_STATIONID].toString();
+            QString tmp = partnerid + storeid + stationid;
+
+            QLOG_DEBUG() << "Store Info : " << tmp;
+
             QFile file(qApp->applicationDirPath() + "/bing.flag");
 
-        return file.exists();
+            if(!file.open(QFile::ReadOnly))
+                return false;
+
+            QByteArray data = file.readAll();
+
+            file.close();
+
+            QLOG_DEBUG() << qApp->applicationDirPath() + "/bing.flag" << ":" << data;
+
+            QString info = QString::fromUtf8(data);
+
+            if(tmp.compare(info, Qt::CaseInsensitive) == 0)
+                return true;
+        }
+
+        return false;
     }
 
-    static void setBind()
+    static void setBind(QVariantMap storeinfo)
     {
-        QFile file(qApp->applicationDirPath() + "/bing.flag");
+        if(storeinfo.isEmpty())
+            return ;
+
+        if(storeinfo.contains(JSON_KEY_PARTNERID) && storeinfo.contains(JSON_STOREID) && storeinfo.contains(JSON_STATIONID))
+        {
+            QString partnerid = storeinfo[JSON_KEY_PARTNERID].toString();
+            QString storeid = storeinfo[JSON_STOREID].toString();
+            QString stationid = storeinfo[JSON_STATIONID].toString();
+            QString tmp = partnerid + storeid + stationid;
+
+            QLOG_DEBUG() << "Store Info : " << tmp;
 
-        file.open(QFile::ReadWrite);
+            QFile file(qApp->applicationDirPath() + "/bing.flag");
 
+            if(file.open(QFile::WriteOnly))
+            {
+                file.write(tmp.toUtf8());
                 file.close();
             }
+        }
+    }
 
     static bool getLogingRequest(const QVariantMap &json, QJsonObject &data)
     {

takeout/model/orderObject.cpp

@@ -112,6 +112,16 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+QString OrderObject::getStore_phone() const
+{
+    return store_phone;
+}
+
+void OrderObject::setStore_phone(const QString &value)
+{
+    store_phone = value;
+}
+
 QString OrderObject::getstore_name() const
 {
     return store_name;

takeout/model/orderObject.h

@@ -70,6 +70,7 @@ public:
     Q_PROPERTY (QString customer_code READ getcustomer_code WRITE setcustomer_code)
 
     Q_PROPERTY (QString store_name READ getstore_name WRITE setstore_name)
+    Q_PROPERTY (QString store_phone READ getStore_phone WRITE setStore_phone)
 
     int service_fee;         //平台佣金
     int dis_platform_fee;    //平台承担的优惠金额
@@ -120,7 +121,11 @@ public:
     int user_fee;            //应付金额
     QStringList records;         //订单操作记
     QString tmp_total;      //临时订单优惠专属
-    QString store_name;
+    QString store_name;     //门店名称
+    QString store_phone;    //门店点哈
+
+    QString getStore_phone() const;
+    void setStore_phone(const QString &value);
 
 protected:
     QString getstore_name() const;

takeout/model/posorderpool.cpp

@@ -122,6 +122,8 @@ void PosOrderPool::InitOrderPool()
 
 bool PosOrderPool::TryInsertOrder(OrderObject order)
 {
+    QLOG_DEBUG() << "Store Phone : " << order.store_phone;
+
     //订单不能为空
     if(order.order_id.isEmpty())
         return false;

takeout/preDefine.h

@@ -14,12 +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 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
@@ -136,6 +136,9 @@
 #define JSON_KEY_PUSH_HOST          "host"
 #define JSON_KEY_PUSH_URL           "url"
 
+#define LOGIN_STORE_NAME            "store_name"
+#define LOGIN_STORE_PHONE           "phone"
+#define LOGIN_RESULT                "result"
 
 #define JSON_KEY_USERID             "user_id"
 #define JSON_KEY_PWD                "pwd"