Skip to content

F
fmtakeout
Commit ac8e48ea by 李定达
Options

测试token1.杯贴添加自提和外卖区分;2.orderobject添加取餐码及取餐码打印;

parent 02effe18
Showing with 71 additions and 28 deletions
takeout/base/Print/printlib.cpp
......@@ -43,7 +43,9 @@ void PrintLib::_PrintLabTest()
{
f_TSCInit();
f_TSCWinPrintln(10, 0, 28, 0, 2, 0, 0, "\xE5\xAE\x8B\xE4\xBD\x93", "7 09/03 09:36 1/2", 0);
QString title("\xE8\x87\xAA\xE6\x8F\x90\x37\x20\x30\x39\x2F\x30\x33\x20\x30\x39\x3A\x33\x36\x20\x39\x39\x2F\x39\x39");
f_TSCWinPrintln(10, 0, 28, 0, 2, 0, 0, "\xE5\xAE\x8B\xE4\xBD\x93", title.toLocal8Bit().data(), 0);
f_TSCWinPrintln(0, 0, 24, 0, 2, 2, 0, "\xE5\xAE\x8B\xE4\xBD\x93", "------------------------------", 0.0266665);
......@@ -91,8 +93,20 @@ void PrintLib::_PrintLab( OrderObject* order)
f_TSCInit();
//qDebug() << "f_TSCInit";
QString title = QString("%1 %2 %3 %4/%5").arg(QString::number(order->order_index), datetime, deliveryTime, QString::number(++index), QString::number(allprod));
f_TSCWinPrintln(10,0,25,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),title.toLocal8Bit().data(),0);
QString title = QString("%1 %2 %3 %4/%5").arg(QString::number(order->order_index), datetime, deliveryTime, QString::number(++index), QString::number(allprod));
QString tmptitle;
if(order->order_type == 3 || order->order_type == 4 || order->order_type == 5 || order->order_type == 6)
{
tmptitle = QString("\xE8\x87\xAA\xE6\x8F\x90").append(title);
}
else
{
tmptitle = QString("\xE5\xA4\x96\xE5\x8D\x96").append(title);
}
f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),tmptitle.toLocal8Bit().data(),0);
f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),"-----------------------------------",0.0266666);
f_TSCWinPrintln(10,0,30,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),dish->name.
append(" ¥").
......
takeout/control/ordergetwork.cpp
......@@ -24,11 +24,20 @@ OrderGetWork::OrderGetWork(QObject *parent) : QObject(parent)
connect(&_timer, &QTimer::timeout, [this] () {
QLOG_INFO() << "Timeout Start login again ...";
QLOG_DEBUG() << "StoreInfo : " << _storeinfo;
if(!_storeinfo.isEmpty())
{
_islogin = false;
login();
}
if(!_storeinfo.isEmpty())
{
if(_timer.isActive())
_timer.stop();
_islogin = false;
login();
if(_islogin == true)
_timer.start(2*60*1000);
else
_timer.start(TIMEOUT_TOKEN_LOGIN);
}
});
//订阅需要拉单的事件
......@@ -38,7 +47,7 @@ OrderGetWork::OrderGetWork(QObject *parent) : QObject(parent)
//
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
_timer.start(7*24*60*60*1000);
_timer.start((TIMEOUT_TOKEN_LOGIN));
}
void OrderGetWork::workStart()
......@@ -716,6 +725,8 @@ void OrderGetWork::login()
QLOG_ERROR() << QThread::currentThreadId() << "loginToServer failed";
break;
}
//重新拉单
emit quit();
}
}while(0);
}
......
takeout/main.cpp
......@@ -131,17 +131,17 @@ int main(int argc, char *argv[])
HANDLE m_hMutex = CreateMutex(NULL, FALSE, L"Global\\fmtakeout");
if(m_hMutex != NULL)
{
if (GetLastError() == ERROR_ALREADY_EXISTS||GetLastError() == ERROR_ACCESS_DENIED) {
CloseHandle(m_hMutex);
m_hMutex = NULL;
return -1;
}
}
else{
return -1;
}
// if(m_hMutex != NULL)
// {
// if (GetLastError() == ERROR_ALREADY_EXISTS||GetLastError() == ERROR_ACCESS_DENIED) {
// CloseHandle(m_hMutex);
// m_hMutex = NULL;
// return -1;
// }
// }
// else{
// return -1;
// }
QApplication a(argc, argv);
......
takeout/model/orderObject.cpp
......@@ -112,6 +112,16 @@ void OrderObject::FromJson(const QJsonObject &json)
return;
}
QString OrderObject::getCode() const
{
return code;
}
void OrderObject::setCode(const QString &value)
{
code = value;
}
QString OrderObject::getStore_phone() const
{
return store_phone;
......
takeout/model/orderObject.h
......@@ -72,6 +72,9 @@ public:
Q_PROPERTY (QString store_name READ getstore_name WRITE setstore_name)
Q_PROPERTY (QString store_phone READ getStore_phone WRITE setStore_phone)
Q_PROPERTY (QString code READ getCode WRITE setCode)
int service_fee; //平台佣金
int dis_platform_fee; //平台承担的优惠金额
int dis_shop_fee; //商户承担的优惠金额
......@@ -84,6 +87,7 @@ public:
QString channel_name; //渠道名称
QString customer; //用户姓名
QString customer_code; //取餐码
QString code; //取餐码
QString coupon; //码
QString courier_name; //配送员信息
QString courier_phone; //配送员电话
......@@ -127,6 +131,9 @@ public:
QString getStore_phone() const;
void setStore_phone(const QString &value);
QString getCode() const;
void setCode(const QString &value);
protected:
QString getstore_name() const;
void setstore_name(const QString &value);
......
takeout/preDefine.h
......@@ -14,16 +14,17 @@
#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
#define TIMEOUT_TOKEN_LOGIN 7*24*60*60*1000
#define TCP_JSON_KEY_STATUS "status"
......
takeout/takeout.rc
......@@ -4,8 +4,8 @@
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,5
PRODUCTVERSION 2,0,0,5
FILEVERSION 2,0,0,6
PRODUCTVERSION 2,0,0,6
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", "2.0.0.5"
VALUE "FileVersion", "2.0.0.6"
VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "2.0.0.5"
VALUE "ProductVersion", "2.0.0.6"
END
END
BLOCK "VarFileInfo"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment