1.SaaS上正式版本;碑帖打印添加门店号

takeout/base/Print/printlib.cpp

@@ -76,8 +76,10 @@ void PrintLib::_PrintLab( OrderObject* order)
         }
         property_tags.remove(property_tags.length()-1,1);
         f_TSCWinPrintln(10,0,24,0,2,2,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),property_tags.toLocal8Bit().data(),0.0666665);
-        f_TSCWinPrintln(10,180,26,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),QString("\xE7\x9C\x9F\xE5\x8C\x97\xE4\xB9\x90\xE8\xB4\xAD ").toLocal8Bit().data(),0.0666665);
+        f_TSCWinPrintln(10,180,26,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),order->store_name.toLocal8Bit().data(),0.0666665);
         f_TSCWinPrintPage("1","1");
+
+
     }
 }
 

takeout/control/orderprintwork.cpp

@@ -13,6 +13,7 @@
 #include "QsLog.h"
 
 #include <QFile>
+#include <QByteArray>
 
 orderprintwork::orderprintwork(QObject *parent) : QObject(parent)
 {

takeout/main.cpp

@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     QDir().mkdir(logDir);
 
     QsLogging::Logger &logger = QsLogging::Logger::instance();
-    logger.setLoggingLevel(QsLogging::TraceLevel);
+    logger.setLoggingLevel(QsLogging::InfoLevel);
     QString logPath = QString("%1/%2").arg(logDir, "takeout.log");
     QsLogging::DestinationPtr fileDst(QsLogging::DestinationFactory::MakeFileDestination(
     logPath, QsLogging::EnableLogRotation, QsLogging::MaxSizeBytes(2*1024*1024), QsLogging::MaxOldLogCount(6)));

takeout/model/orderObject.cpp

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

takeout/model/orderObject.h

@@ -69,6 +69,8 @@ public:
 
     Q_PROPERTY (QString customer_code READ getcustomer_code WRITE setcustomer_code)
 
+    Q_PROPERTY (QString store_name READ getstore_name WRITE setstore_name)
+
     int service_fee;         //平台佣金
     int dis_platform_fee;    //平台承担的优惠金额
     int dis_shop_fee;        //商户承担的优惠金额
@@ -118,8 +120,12 @@ public:
     int user_fee;            //应付金额
     QStringList records;         //订单操作记
     QString tmp_total;      //临时订单优惠专属
+    QString store_name;
 
 protected:
+    QString getstore_name() const;
+    void setstore_name(const QString &value);
+
     QString getcustomer_code() const{
         return customer_code;
     }

takeout/preDefine.h

@@ -14,12 +14,13 @@
 #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
 #define TIMEOUT_TRY_PULLORDER       60000

takeout/view/detailForm.cpp

@@ -120,7 +120,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     else
         ui->detailBtn2->show();
 
-    if(/*orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&&*/ orderObject->status != 4)
+    if(/*orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&&*/ orderObject->refund_status != 20 && orderObject->status != 4)
     {
         ui->detailBtn2->hide();
     }
@@ -142,9 +142,15 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailBtn3->setProperty("orderId", orderObject->order_id);
     ui->detailBtn3->setProperty("ordertype", orderObject->order_type);
 
-    if((orderObject->order_type == 1) || (orderObject->order_type == 2) &&
-            ui->detailBtn3->text().compare(QString::fromLocal8Bit(OPERATIONNAME_MAKEOVER)) == 0 && orderObject->status == 2)
+    QLOG_DEBUG() << "----------------------------------------" << orderObject->order_id << ";" << orderObject->refund_status << orderObject->status;
+
+    if((orderObject->order_type == 1 || orderObject->order_type == 2) &&
+            ui->detailBtn3->text().compare(QString::fromLocal8Bit(OPERATIONNAME_MAKEOVER)) == 0 &&
+            orderObject->status == 2 &&
+            orderObject->refund_status != 20)
     {
+        QLOG_DEBUG() << "++++++++++++++++++++++++++++++++++" << orderObject->order_id << ";" << orderObject->refund_status << orderObject->status;
+
         ui->detailBtn3->setText(QString::fromLocal8Bit(OPERATIONNAME_SENDOUT));
         ui->detailBtn3->setProperty("operation", OPERATION_SENDOUT);
     }