Skip to content

F
fmtakeout
Commit 6c0db390 by 李定达
Options

1.添声音素材;2.添加资源素材;3.打开界面声音响一次,不打开界面一直响;4.修改版本号

parent b8fda1b3
Showing with 839 additions and 24 deletions
Resources/skin/deaufult.qrc 0 → 100644
<RCC>
<qresource>
<file>deaufult.qss</file>
<file>tabBtn_normal.png</file>
<file>tabBtn_checked.png</file>
<file>magn.png</file>
<file>pickBtn_select.png</file>
<file>error.png</file>
<file>ok.png</file>
<file>loading.gif</file>
<file>alert_bg.png</file>
<file>btnUp_normal.png</file>
<file>btnUp_press.png</file>
<file>btnDown_normal.png</file>
<file>btnDown_press.png</file>
<file>cbxArrow.png</file>
<file>logo_0.png</file>
<file>float_normal.png</file>
<file>float_remind.png</file>
<file>detailBtn_close_normal.png</file>
<file>detailBtn_close_press.png</file>
<file>fm.ico</file>
<file>delBtn_normal.png</file>
<file>delBtn_press.png</file>
<file>numBtn_normal.png</file>
<file>numBtn_press.png</file>
<file>login_logo.png</file>
<file>base_logo.png</file>
<file>loginlogin.png</file>
</qresource>
</RCC>
\ No newline at end of file
Resources/skin/deaufult.qss 0 → 100644
QWidget
{
font: 9pt "微软雅黑";
}
/*---------------------------------mainForm[begin]---------------------------------*/
#MainForm
{
background-color: #303030;
}
#mainFrmHead
{
background-color: #a02125;
}
#mainSlabLogo0
{
border-image: url(:logo_0.png);
}
#mainSlabLogo1
{
border-image: url(:logo_1.png);
}
#mainBtnNew,#mainBtnMake,#mainBtnMakeOver,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther
{
color: #e4d0cd;
border-image: url(:tabBtn_normal.png);
}
#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnMakeOver:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOther:checked
{
color: #262626;
border-image: url(:tabBtn_checked.png);
}
#mainBtnHide,#mainBtnSet,#mainBtnPrt
{
color: rgb(255, 255, 255);
background-color: #a02125;
border: 1px solid #ffffff;
border-radius: 5px;
}
#mainBtnHide:pressed,#mainBtnSet:pressed,#mainBtnPrt:pressed
{
color: #a02125;
background-color: #ffffff;
}
#mainFrmTables
{
background-color: rgb(255, 255, 255);
}
#mainBtnUp
{
border-image: url(:btnUp_normal.png);
}
#mainBtnUp:pressed
{
border-image: url(:btnUp_press.png);
}
#mainBtnDown
{
border-image: url(:btnDown_normal.png);
}
#mainBtnDown:pressed
{
border-image: url(:btnDown_press.png);
}
#mainFrmSearch
{
background-color: #303030;
}
#mainFrmSearchC,#mainEdtSearch
{
color: #cbcbcb;
background-color: #535353;
}
#mainSlabMagn
{
border-image: url(:magn.png);
}
#mainLabPlacard
{
color: #b9b9b9;
background-color: #262626;
}
#mainSlabStoreid,#mainSlabOpeStatus,#mainSlabNetStatus,#mainSlabVersion,#mainSlabCashier,
#mainSlabTime,#mainLabStoreid,#mainLabOpeStatus,#mainLabNetStatus,#mainLabVersion,#mainLabCashier
{
color: #9b9b9b;
}
#mainProcBtn
{
color: #878787;
background-color: #ffffff;
border: 1px solid #878787;
border-radius: 4px;
}
#mainProcBtn:pressed
{
color: #3de17b;
background-color: #ffffff;
border: 1px solid #3de17b;
border-radius: 4px;
}
#mainBtnOpeDetails:pressed,#mainBtnCashier:pressed
{
color: rgb(172, 219, 169);
}
#mainTableNew,#mainTableMake,#mainTableMakeOver,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther
{
font: 11pt "微软雅黑";
color: rgb(98, 98, 98);
selection-background-color: #f4f4f4;
}
#mainTableNew QHeaderView::section,#mainTableMake QHeaderView::section,
#mainTableMakeOver QHeaderView::section,#mainTableSend QHeaderView::section,
#mainTableFinsh QHeaderView::section,#mainTableRefund QHeaderView::section,
#mainTableOther QHeaderView::section
{
border: 0px;
background: rgb(255, 255, 255);
color: #878787;
}
#mainTableNew QHeaderView::down-arrow,#mainTableMake QHeaderView::down-arrow,
#mainTableMakeOver QHeaderView::down-arrow,#mainTableSend QHeaderView::down-arrow,
#mainTableFinsh QHeaderView::down-arrow,#mainTableRefund QHeaderView::down-arrow,
#mainTableOther QHeaderView::down-arrow
{
border: 0px;
}
#mainTableNew QHeaderView::up-arrow,#mainTableMake QHeaderView::up-arrow,
#mainTableMakeOver QHeaderView::up-arrow,#mainTableSend QHeaderView::up-arrow,
#mainTableFinsh QHeaderView::up-arrow,#mainTableRefund QHeaderView::up-arrow,
#mainTableOther QHeaderView::up-arrow
{
border: 0px;
}
#mainTableNew QScrollBar:vertical,#mainTableMake QScrollBar:vertical,
#mainTableMakeOver QScrollBar:vertical,#mainTableSend QScrollBar:vertical,
#mainTableFinsh QScrollBar:vertical,#mainTableRefund QScrollBar:vertical,
#mainTableOther QScrollBar:vertical
{
background: transparent;
width: 8px;
}
#mainTableNew QScrollBar::handle:vertical,#mainTableMake QScrollBar::handle:vertical,
#mainTableMakeOver QScrollBar::handle:vertical,#mainTableSend QScrollBar::handle:vertical,
#mainTableFinsh QScrollBar::handle:vertical,#mainTableRefund QScrollBar::handle:vertical,
#mainTableOther QScrollBar::handle:vertical
{
border-radius: 6px;
background: #878787;
min-height: 20px;
}
#mainTableNew QScrollBar::add-line:vertical,#mainTableMake QScrollBar::add-line:vertical,
#mainTableMakeOver QScrollBar::add-line:vertical,#mainTableSend QScrollBar::add-line:vertical,
#mainTableFinsh QScrollBar::add-line:vertical,#mainTableRefund QScrollBar::add-line:vertical,
#mainTableOther QScrollBar::add-line:vertical
{
height: 0px;
}
#mainTableNew QScrollBar::sub-line:vertical,#mainTableMake QScrollBar::sub-line:vertical,
#mainTableMakeOver QScrollBar::sub-line:vertical,#mainTableSend QScrollBar::sub-line:vertical,
#mainTableFinsh QScrollBar::sub-line:vertical,#mainTableRefund QScrollBar::sub-line:vertical,
#mainTableOther QScrollBar::sub-line:vertical
{
height: 0px;
}
#mainListWdg0
{
spacing: 10px;
color: rgb(90, 90, 90);
font: 12pt "微软雅黑";
}
#mainListWdg0::item
{
height: 30px;
}
#mainListWdg0::item:selected
{
background: #ffbf3f;
}
/*---------------------------------mainForm[ end ]---------------------------------*/
/*---------------------------------pickForm[begin]---------------------------------*/
#pickWdg
{
background-color: rgba(0, 0, 0, 90);
}
#pickLabMsg
{
color: rgb(255, 255, 255);
}
#pickBtn0,#pickBtn1,#pickBtn2,#pickBtn3,#pickBtn4,#pickBtn5,#pickBtn6,#pickBtn7,#pickBtn8,#pickBtn9
{
color: #3d3d3d;
background-color: rgb(255, 255, 255);
border-radius: 6px;
}
#pickBtn0:checked,#pickBtn1:checked,#pickBtn2:checked,#pickBtn3:checked,#pickBtn4:checked,
#pickBtn5:checked,#pickBtn6:checked,#pickBtn7:checked,#pickBtn8:checked,#pickBtn9:checked
{
color: rgb(24, 206, 0);
background-color: rgb(255, 255, 255);
border-radius: 6px;
border-image: url(:pickBtn_select.png);
}
#pickBtnOk
{
color: rgb(24, 206, 0);
background-color: rgb(255, 255, 255);
border-radius: 6px;
}
#pickBtnCancle
{
color: rgb(235, 0, 0);
background-color: rgb(255, 255, 255);
border-radius: 6px;
}
#pickBtnOk:pressed,#pickBtnCancle:pressed
{
color: rgb(161, 161, 161);
background-color: rgb(255, 255, 255);
border-radius: 6px;
}
#pickBtnOk:disabled
{
color: #3d3d3d;
background-color: rgb(230, 230, 230);
border-radius: 6px;
}
/*---------------------------------pickForm[ end ]---------------------------------*/
/*---------------------------------settingForm[begin]---------------------------------*/
#settingWdg
{
border-image: url(:alert_bg.png);
}
#settingSlabPrinter
{
color: rgb(105, 107, 108);
}
#settingCbxPrinter
{
color: rgb(105, 107, 108);
padding: 1px 18px 1px 3px;
border: 1px solid gray;
border-radius: 5px;
}
#settingCbxPrinter::drop-down
{
width: 30px;
border-left-width: 0px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
#settingCbxPrinter::down-arrow
{
border-image: url(:cbxArrow.png);
}
#settingCbxPrinter QAbstractItemView::item
{
height: 40px;
}
#settingBtnPrintTest,#settingBtnSoundTest,#settingBtnOk
{
color: #ffffff;
background-color: #ad3237;
border-radius: 4px;
}
#settingBtnPrintTest:pressed,#settingBtnSoundTest:pressed,#settingBtnOk:pressed
{
background-color: #a02125;
}
/*---------------------------------settingForm[ end ]---------------------------------*/
/*---------------------------------padForm[begin]---------------------------------*/
#PadForm
{
background-color: #f1f0f0;
}
#padBtn0,#padBtn1,#padBtn2,#padBtn3,#padBtn4,
#padBtn5,#padBtn6,#padBtn7,#padBtn8,#padBtn9
{
font: 13pt "微软雅黑";
color: rgb(98, 98, 98);
border-image: url(:numBtn_normal.png);
}
#padBtn0:pressed,#padBtn1:pressed,#padBtn2:pressed,#padBtn3:pressed,#padBtn4:pressed,
#padBtn5:pressed,#padBtn6:pressed,#padBtn7:pressed,#padBtn8:pressed,#padBtn9:pressed
{
color: #ffffff;
border-image: url(:numBtn_press.png);
}
#padBtnClearn
{
font: 11pt "微软雅黑";
color: rgb(98, 98, 98);
border-image: url(:numBtn_normal.png);
}
#padBtnClearn:pressed
{
color: #ffffff;
border-image: url(:numBtn_press.png);
}
#padBtnDel
{
border-image: url(:numBtn_normal.png);
image: url(:delBtn_normal.png);
}
#padBtnDel:pressed
{
border-image: url(:numBtn_press.png);
image: url(:delBtn_press.png);
}
/*---------------------------------padForm[ end ]---------------------------------*/
/*---------------------------------alertForm[begin]---------------------------------*/
#alertWdg
{
border-image: url(:alert_bg.png);
}
#alertLabError
{
border-image: url(:error.png);
}
#alertLabOk
{
border-image: url(:ok.png);
}
#alertLabMsg
{
color: rgb(129, 129, 129);
}
#alertBtnOk
{
color: #878787;
background-color: #ffffff;
border: 1px solid #878787;
border-radius: 4px;
}
#alertBtnOk:pressed
{
color: #3de17b;
background-color: #ffffff;
border: 1px solid #3de17b;
border-radius: 4px;
}
/*---------------------------------alertForm[ end ]---------------------------------*/
/*---------------------------------DetailForm[begin]---------------------------------*/
#DetailForm
{
background-color: rgb(255, 255, 255);
}
#detailFrmHead
{
background-color: #ad3237;
}
#detailLeftHead
{
font: 10pt "微软雅黑";
color: #676666;
background-color: #f1f0f0;
}
#detailRightHead
{
font: 10pt "微软雅黑";
color: #666666;
background-color: #dddadb;
}
#detailBtnClose
{
border-image: url(:detailBtn_close_normal.png);
}
#detailBtnClose:pressed
{
border-image: url(:detailBtn_close_press.png);
}
#detailFrm0,#detailFrm1
{
margin-right: -1px;
margin-top: -2px;
margin-bottom: -2px;
border-image: url(:detailFrm_bg.png);
}
#detailFrm2
{
background-color: #e5e5e5;
}
#detailSlab11
{
color: #4b4b4b;
}
#detailFrm3,#detailFrm4
{
margin-left: 1px;
margin-bottom: -1px;
border-image: url(:detailFrm_bg1.png);
}
#detailSlab9,#detailSlab10
{
font: bold 10pt "微软雅黑";
color: rgb(173, 223, 152);
}
#detailSlab0,#detailSlab1,#detailSlab2,#detailSlab3,#detailSlab4,
#detailSlab5,#detailSlab6,#detailSlab7,#detailSlab8,#detailSlab8_3
{
color: #a6a6a6;
background-color: #faf9f9;
border: 1px solid #ececec;
}
#detailLab0,#detailLab2,#detailLab3,#detailLab4,
#detailLab5,#detailLab6,#detailLab7,#detailLab8,#detailLab8_3
{
border-top: 1px solid #ececec;
border-bottom: 1px solid #ececec;
color: #4d4d4d;
background-color: #faf9f9;
}
#detailLab1
{
color: rgb(190, 63, 0);
background-color: #faf9f9;
}
#detailBtn0,#detailBtn1,#detailBtn3
{
color: #ffffff;
background-color: #3e4d65;
border-radius: 5px;
}
#detailBtn2
{
color: #ffffff;
background-color: #ad3237;
border-radius: 5px;
}
#detailBtn2:pressed
{
background-color: #be3c41;
}
#detailBtn0:pressed,#detailBtn1:pressed,#detailBtn3:pressed
{
background-color: #4d5f7c;
}
#detailTable0
{
background-color: #ffffff;
color: #333333;
}
#detailLabRecord
{
color: #4b4b4b;
background-color: #f9f9f9;
}
#detailTable0 QHeaderView::section
{
border: 0px;
background: #ffffff;
color: #636363;
}
#detailTable0 QScrollBar:vertical
{
background: rgb(180, 205, 163, 0);
width: 10px;
}
#detailTable0 QScrollBar::handle:vertical
{
border-radius: 6px;
background: rgb(207, 234, 187);
min-height: 20px;
}
#detailTable0 QScrollBar::add-line:vertical,
#detailTable0 QScrollBar::sub-line:vertical
{
height: 0px;
}
/*---------------------------------DetailForm[ end ]---------------------------------*/
/*---------------------------------RejectForm[start]-------------------------------------*/
#RejectForm
{
background-color:rgb(245,245,245);
}
#rejectLabHead
{
font: 14pt "微软雅黑";
background-color:rgb(238, 122, 42);
}
#rejectBtnOk,#rejectBtnCancle
{
font: 14pt "微软雅黑";
color: rgb(255, 255, 255);
background-color: rgb(238,122,42);
border-radius: 3px;
}
#rejectBtnOk:pressed,#rejectBtnCancle:pressed
{
color: rgb(161, 161, 161);
background-color: rgb(222,184,135);
border-radius: 3px;
}
#rejectRbtn0,#rejectRbtn1,#rejectRbtn2,#rejectRbtn3,#rejectRbtn4,#rejectRbtn5
{
font: 14pt "微软雅黑";
}
/*---------------------------------RejectForm[end]-------------------------------------*/
/*---------------------------------LoginForm[start]-------------------------------------*/
#LoginForm
{
background-color: #f2f2f2；
}
#widget_left,#widget_right
{
background-color: #ffffff；
}
#label_logo
{
border-image: url(:login_logo.png);
}
#label_logotitle
{
font: 16pt "微软雅黑";
color: #333333;
}
#label_title
{
font: 16pt "微软雅黑";
color: #333333;
border-bottom: 1px solid #D9D9D9;
}
#label_partnerid,#label_account,#label_pwd,#label_storeid,#label_posno
{
font: 14pt "微软雅黑";
color: #333333;
}
#lineEdit_partnerid,#lineEdit_account,#lineEdit_pwd,#lineEdit_storeid,#lineEdit_posno
{
font: 14pt "微软雅黑";
color: #333333;
border: 1px solid #D9D9D9;
border-radius: 5px;
}
#pushButton_login
{
font: 14pt "微软雅黑";
color: #ffffff;
background-color: #169bd5;
border-radius: 5px;
}
#pushButton_1,#pushButton_2,#pushButton_5,#pushButton_8,#pushButton_4,#pushButton_7
{
font: 14pt "微软雅黑";
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-right-style: 0px;
border-bottom-style: 0px;
}
#pushButton_del
{
font: 14pt "微软雅黑";
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-right-style: 0px;
}
#pushButton_0
{
font: 14pt "微软雅黑";
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-right-style: 0px;
}
#pushButton_3,#pushButton_6,#pushButton_9
{
font: 14pt "微软雅黑";
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
border-bottom-style: 0px;
}
#pushButton_clear
{
font: 14pt "微软雅黑";
color: #000000;
background-color: #ffffff;
border: 1px solid #D9D9D9;
}
#pushButton_close
{
border-image: url(:error.png);
}
/*---------------------------------LoginForm[end]-------------------------------------*/
/*---------------------------------DailyReportForm[start]-------------------------------------*/
/*---------------------------------DailyReportForm[end]-------------------------------------*/
/*---------------------------------floatForm[start]-------------------------------------*/
#label_new
{
font: 75 13pt "黑体";
color: #0073FF;
}
#label_refund
{
font: 75 13pt "黑体";
color: #FF000A;
}
#label_newnum
{
font: 75 17pt "微软雅黑";
color: #0073FF;
}
#label_refundnum
{
font: 75 17pt "微软雅黑";
color: #FF000A;
}
#widget_base
{
border-image: url(:base_logo.png);
}
#widget_login
{
border-image: url(:loginlogin.png);
}
#widget_synshow
{
border-image: url(:loginlogin.png);
}
#label_newmsg
{
font: 12pt "微软雅黑";
color: #FF000A;
}
/*---------------------------------floatForm[end]-------------------------------------*/
Resources/skin/make.bat 0 → 100644
rcc -binary deaufult.qrc -o deaufult.rcc
\ No newline at end of file
takeout/control/ordergetwork.h
......@@ -9,6 +9,7 @@
#include <QVariantMap>
#include <QJsonDocument>
#include <QApplication>
#include <QSettings>
#include "base/Network/billSocket.h"
......@@ -203,7 +204,9 @@ private:
data.insert(JSON_KEY_PARTNERID, token);
data.insert(JSON_KEY_TIMESTAMP, timestamp);
//data.insert(JSON_KEY_TIMESTAMP, 0);
data.insert(JSON_KEY_AUTOCONFIRM, autoconfirm);
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
QString autoconf = QSettings(configfile, QSettings::IniFormat).value(INI_AUTOCONFIRM, "0").toString();
data.insert(JSON_KEY_AUTOCONFIRM, autoconf);
data.insert(JSON_KEY_STOREUNIFYID, json[JSON_KEY_UNIFYID].toString());
return true;
......
takeout/main.cpp
......@@ -160,6 +160,7 @@ int main(int argc, char *argv[])
MainForm mainform;
LoginForm loginform;
FloatForm floatform;
//开始展示界面
mainform.MyShow();
loginform.showfull();
......@@ -232,7 +233,7 @@ void InitLog()
QDir().mkdir(logDir);
QsLogging::Logger &logger = QsLogging::Logger::instance();
logger.setLoggingLevel(QsLogging::InfoLevel);
logger.setLoggingLevel(QsLogging::DebugLevel);
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/posorderpool.cpp
......@@ -139,6 +139,7 @@ void PosOrderPool::loadOrders()
void PosOrderPool::removeOrderInfo(QString key)
{
QMutexLocker loker(&s_mutex);
s_order_pool.remove(key);
}
......@@ -218,6 +219,11 @@ bool PosOrderPool::TryInsertOrder(OrderObject order)
return true;
}
else
{
s_order_pool.insert(order.order_id, info);
return true;
}
return false;
}
......@@ -396,7 +402,7 @@ bool PosOrderPool::GetOrderBaseInfo(QString key, QVariantHash &hash)
return true;
}
void PosOrderPool::GetOrderNum(int &tk_new, int &tk_make, int &tk_send, int tk_refund, int &self_new, int &self_make, int &self_refund)
void PosOrderPool::GetOrderNum(int &tk_new, int &tk_make, int &tk_send, int &tk_refund, int &self_new, int &self_make, int &self_refund)
{
tk_new = s_takeout_new;
tk_make = s_takeout_make;
......@@ -407,6 +413,34 @@ void PosOrderPool::GetOrderNum(int &tk_new, int &tk_make, int &tk_send, int tk_r
self_refund = s_self_refund;
}
bool PosOrderPool::GetSearchOrder(QString key, QMap<QString, QString> &map)
{
bool serachflag = false;
if(PosOrderPool::s_mutex.tryLock())
{
if(!s_order_pool.empty())
{
for (auto it = s_order_pool.begin(); it != s_order_pool.end(); ++ it)
{
if(it.value().order_status == DefaultOrder && it.value().order_refund == DefaultOrder)
continue;
QString phone = it.value().order_data.phone;
if(it.key().startsWith(key, Qt::CaseInsensitive)|| phone.startsWith(key, Qt::CaseInsensitive))
{
map.insert(it.key(), phone);
serachflag = true;
}
}
}
s_mutex.unlock();
return serachflag;
}
return false;
}
bool PosOrderPool::event(QEvent *e)
{
......@@ -493,12 +527,17 @@ void PosOrderPool::UpdateOrderNum(const OrderObject *order, const OrderObject *o
GetOrderStatus(orderold, status);
QLOG_DEBUG() << "OLD UpdateOrderNum input 0 : " << orderold->order_id;
if(orderold->order_type == TimelyTakeout || orderold->order_type == AppointmentTakeout)
{
QLOG_DEBUG() << "OLD DECTAKEOUT UpdateOrderNum input 0 : " << orderold->order_id;
DECTAKEOUT(status, s_takeout_new, s_takeout_make, s_takeout_send, s_takeout_refund);
}
else if(orderold->order_type == TimelyInvite || orderold->order_type == AppointmentInvite)
{
QLOG_DEBUG() << "OLD DECTAKEOUT UpdateOrderNum input 0 : " << orderold->order_id;
DECSELF(status, s_self_new, s_self_make, s_self_refund);
}
......@@ -510,12 +549,18 @@ void PosOrderPool::UpdateOrderNum(const OrderObject *order, const OrderObject *o
GetOrderStatus(order, status);
QLOG_DEBUG() << "NEW UpdateOrderNum input 0 : " << order->order_id;
if(order->order_type == TimelyTakeout || order->order_type == AppointmentTakeout)
{
QLOG_DEBUG() << "NEW INCTAKEOUT UpdateOrderNum input 0 : " << order->order_id;
QLOG_DEBUG() << "NEW INCTAKEOUT UpdateOrderNum input 3 : " << status;
INCTAKEOUT(status, s_takeout_new, s_takeout_make, s_takeout_send, s_takeout_refund);
QLOG_DEBUG() << "NEW INCTAKEOUT UpdateOrderNum input 4 : " << s_takeout_refund;
}
else if(order->order_type == TimelyInvite || order->order_type == AppointmentInvite)
{
QLOG_DEBUG() << "NEW INCSELF UpdateOrderNum input 0 : " << order->order_id;
INCSELF(status, s_self_new, s_self_make, s_self_refund);
}
}
......
takeout/model/posorderpool.h
......@@ -193,7 +193,9 @@ public:
static bool GetOrderBaseInfo(QString key, QVariantHash &hash);
static void GetOrderNum(int &tk_new, int &tk_make, int &tk_send, int tk_refund, int &self_new, int &self_make, int &self_refund);
static void GetOrderNum(int &tk_new, int &tk_make, int &tk_send, int &tk_refund, int &self_new, int &self_make, int &self_refund);
static bool GetSearchOrder(QString key, QMap<QString, QString> &map);
virtual bool event(QEvent *e);
......
takeout/preDefine.h
......@@ -211,6 +211,7 @@
#define OPERATIONNAME_REFUSEREFUND "拒绝"
#define OPERATIONNAME_REFUNDORDER "退单"
#define OPERATIONNAME_AGREE "同意"
#define OPERATIONNAME_REFUNDNEWORDER "拒绝接单"
#define REJECTUITYPE_REFUSEREFUND 0
#define REJECTUITYPE_AGREEREFUND 1
......@@ -249,9 +250,9 @@
// 默认重新尝试登录的时间
#define VALUE_RELOGINTIME 20000
// 新订单提示音音频时长
#define VALUE_NEWORDERTIME 6000 //TODO
#define VALUE_NEWORDERTIME 3000 //TODO
// 需退款提示音音频时长
#define VALUE_REFUNDORDERTIME 5000 //TODO
#define VALUE_REFUNDORDERTIME 3000 //TODO
// 拒绝退款理由
#define VALUE_REFUSEREFUND_REASON "拒绝退款"
//
......
takeout/takeout.rc
......@@ -4,8 +4,8 @@
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,0,0
PRODUCTVERSION 3,0,0,0
FILEVERSION 3,0,0,2
PRODUCTVERSION 3,0,0,2
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", "3.0.0.0"
VALUE "FileVersion", "3.0.0.2"
VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "3.0.0.0"
VALUE "ProductVersion", "3.0.0.2"
END
END
BLOCK "VarFileInfo"
......
takeout/view/detailForm.cpp
......@@ -88,6 +88,12 @@ bool DetailForm::getOtherOrderOptAndName(OrderObject *order, QString &optname, Q
switch (status) {
case NewOrder:
if(QString("saas").compare(order->channel) != 0)
{
optname = OPERATION_REFUSE;
name = QString::fromLocal8Bit(OPERATIONNAME_REFUNDNEWORDER);
return true;
}
return false;
case FirmOrder:
return false;
......
takeout/view/floatForm.cpp
......@@ -109,9 +109,11 @@ bool FloatForm::event(QEvent *e)
QLOG_DEBUG() << "input : " << orderid << orderstatus << refundstatus << oldorder;
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
QString autoconf = QSettings(configfile, QSettings::IniFormat).value(INI_AUTOCONFIRM, "0").toString();
if(!oldorder && (orderstatus == NewOrder || orderstatus == FirmOrder) &&
refundstatus != ApplicationRefundOrder)
if(!oldorder && ((orderstatus == NewOrder && autoconf.toInt() == 0) || (orderstatus == FirmOrder && autoconf.toInt() == 1)) &&
refundstatus != ApplicationRefundOrder && refundstatus != ApplicationPartialRefundOrder)
{
onStartRemind(0);
return true;
......@@ -143,7 +145,7 @@ bool FloatForm::event(QEvent *e)
QLOG_DEBUG() << "tk_refund" << tk_refund << "self_refund" << self_refund;
ui->label_newnum->setText(QString::number(tk_new + self_new + tk_make + self_make));
ui->label_refund->setText(QString::number(self_refund + tk_refund));
ui->label_refundnum->setText(QString::number(self_refund + tk_refund));
return true;
}
......@@ -358,23 +360,25 @@ void FloatForm::onStartRemind(int type)
{
m_bReminding = true;
}
m_remindTimer.start(1000*30);
if(m_remindTimer.isActive())
m_remindTimer.stop();
if(this->isHidden())
m_remindTimer.start(1*1000);
else
m_remindTimer.start(7*24*60*60*1000);
m_remindTimer.setSingleShot(true);
connect(&m_remindTimer, &QTimer::timeout, this, &FloatForm::onStopRemind);
_Blink();
_PlayWav();
if(type)
_UdpRadio("msg1.wav",1,m_wavPlayInterval);
else
_UdpRadio("msg.wav",1,m_wavPlayInterval);
}
void FloatForm::onStopRemind()
{
if(m_bReminding)
{
_UdpRadio("msg1.wav",0,m_wavPlayInterval);
}
// if(m_bReminding)
// {
// _UdpRadio("msg1.wav",0,m_wavPlayInterval);
// }
m_bReminding = false;
}
......
takeout/view/floatForm.h
......@@ -21,7 +21,6 @@ public:
~FloatForm();
virtual bool event(QEvent *e);
protected:
void mouseMoveEvent(QMouseEvent * event);
void mousePressEvent(QMouseEvent * event);
......
takeout/view/mainForm.cpp
......@@ -36,6 +36,7 @@ MainForm::MainForm(QWidget *parent) :
m_tableList.append(ui->mainTableMakeOver);
connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime);
connect(ui->mainEdtSearch, &ClickedLineEdit::textChanged, this, &MainForm::onSerachOrder);
//订阅事件
FMApplication::subscibeEvent(this, PosEvent::s_login_status);
......@@ -46,6 +47,7 @@ MainForm::MainForm(QWidget *parent) :
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
FMApplication::subscibeEvent(this, PosEvent::s_show_mainform);
// 初始化界面
_Init();
......@@ -641,10 +643,26 @@ void MainForm::onSearchResultItemClicked(QListWidgetItem *item)
m_padForm->hide();
m_resultForm->hide();
QString str=item->text();
QLOG_DEBUG() << "mainForm input 0" << str;
str=str.mid(4);
QLOG_DEBUG() << "mainForm input 1" << str;
QString y = " ";
str=str.mid(0,str.indexOf(y));
emit getOrderDetails(str);
QLOG_DEBUG() << "mainForm input 2" << str;
//emit getOrderDetails(str);
OrderObject order;
if(!PosOrderPool::GetOrderObject(str, order))
return ;
onHideAlert();
m_detailForm->InitData(&order);
m_detailForm->show();
}
void MainForm::onEntryResult(OrderObject *orderObject, int type)
{
......@@ -690,3 +708,27 @@ void MainForm::on_mainBtnPrt_clicked()
{
m_prtForm->show();
}
void MainForm::onSerachOrder(const QString &key)
{
if(key.isEmpty())
{
m_resultForm->hide();
return;
}
QMap<QString, QString> map;
m_resultForm->clear();
if(PosOrderPool::GetSearchOrder(key, map))
{
QMap<QString,QString>::const_iterator order;
for(order=map.begin(); order!=map.end(); order++)
{
QListWidgetItem* item=new QListWidgetItem();
item->setText(QString::fromLocal8Bit("订单号:") + order.key() + QString::fromLocal8Bit(" 手机号:") + order.value());
m_resultForm->addItem(item);
}
m_resultForm->show();
}
}
takeout/view/mainForm.h
......@@ -228,6 +228,11 @@ public slots:
* 参数:NULL
* 返回:NULL
* */
void onSerachOrder(const QString &key);
/* 功能:隐藏通知窗口
* 参数:NULL
* 返回:NULL
* */
void onHideAlert();
/* 功能:显示通知窗口
* 参数:[1]窗口类型[2]显示信息
......
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