Skip to content

F
fmTakeaway-WDM
Commit ba8a41f6 by 戴尚尚
Options

Add 1:修改小票显示金额(商品金额-商家优惠)、日结显示金额

parent 32465fbf
Showing with 93 additions and 87 deletions
fmPrinter/fmPrinter.cpp
......@@ -125,13 +125,13 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
result_str.append("|");
result_str.append(QString::number(productCount));
result_str.append("|");
result_str.append(_Penny2Dollar(pData->discount_fee));
result_str.append(QString("[平台:%1][商家:%2]").arg(_Penny2Dollar(pData->discount_fee - pData->dis_shop_fee),_Penny2Dollar(pData->dis_shop_fee)));
result_str.append("|");
result_str.append(_Penny2Dollar(pData->send_fee));
result_str.append("|");
result_str.append(_Penny2Dollar(pData->total_fee)); // 订单总金额
result_str.append("|");
result_str.append(_Penny2Dollar(pData->product_fee));// 商品金额
result_str.append(_Penny2Dollar(pData->product_fee - pData->dis_shop_fee));// 商品金额
result_str.append("|");
result_str.append(pData->address);
result_str.append("|");
......
fmTakeaway/Control/flowControl.cpp
......@@ -88,50 +88,50 @@ bool FlowControl::_Login()
m_storeName = recvJson[JSON_STORENAME].toString();
FmPrinter::GetInstance().setStoreName(m_storeName);
//
// 初始化本地数据库
QString dbPath = QString("%1/%2.db").arg(g_appDir, m_storeId);
QFile file( dbPath );
bool bInit = !file.exists();
m_db = QSqlDatabase::addDatabase("QSQLITE","bills");
m_db.setDatabaseName(dbPath);
m_db.open();
if( bInit )
{
QSqlQuery query(m_db);
query.exec( "CREATE TABLE orders( orderId VARCHAR, createTime DATETIME, \
jsonStr VARCHAR, bPrinted BOOLEAN, bRecord BOOLEAN );");
query.clear();
query.exec( QString("INSERT INTO orders VALUES ('freemud', '1970-01-01', '0', 0, 0);") );
query.clear();
}
// 获取本地数据库订单信息
QSqlQuery query(m_db);
query.exec( QString("SELECT * from orders where createTime = '%1';")
.arg(QDate::currentDate().toString("yyyy-MM-dd")) );
if( query.next() )
{
do
{
QLOG_INFO() << QString(">>>>>>>>>>>>>>>>>>>>>>>>>");
QLOG_INFO() << QString("获取到本地订单[%1]: %2").arg(query.value("orderId").toString())
.arg(query.value("jsonStr").toString());
QJsonObject order = QJsonDocument::fromJson(query.value("jsonStr").toByteArray()).object();
OrderObject *orderObj;
orderObj = new OrderObject(this);
orderObj->FromJson(order);
m_ordersMap.insert(orderObj->order_id, orderObj);
emit changeOrderStatus(orderObj);
}while( query.next() );
}
query.clear();
query.exec( QString("SELECT jsonStr from orders where orderId = 'freemud';") );
if( query.next() )
{
m_timestamp = query.value(0).toString();
}
//
// //
// // 初始化本地数据库
// QString dbPath = QString("%1/%2.db").arg(g_appDir, m_storeId);
// QFile file( dbPath );
// bool bInit = !file.exists();
// m_db = QSqlDatabase::addDatabase("QSQLITE","bills");
// m_db.setDatabaseName(dbPath);
// m_db.open();
// if( bInit )
// {
// QSqlQuery query(m_db);
// query.exec( "CREATE TABLE orders( orderId VARCHAR, createTime DATETIME, \
// jsonStr VARCHAR, bPrinted BOOLEAN, bRecord BOOLEAN );");
// query.clear();
// query.exec( QString("INSERT INTO orders VALUES ('freemud', '1970-01-01', '0', 0, 0);") );
// query.clear();
// }
// // 获取本地数据库订单信息
// QSqlQuery query(m_db);
// query.exec( QString("SELECT * from orders where createTime = '%1';")
// .arg(QDate::currentDate().toString("yyyy-MM-dd")) );
// if( query.next() )
// {
// do
// {
// QLOG_INFO() << QString(">>>>>>>>>>>>>>>>>>>>>>>>>");
// QLOG_INFO() << QString("获取到本地订单[%1]: %2").arg(query.value("orderId").toString())
// .arg(query.value("jsonStr").toString());
// QJsonObject order = QJsonDocument::fromJson(query.value("jsonStr").toByteArray()).object();
// OrderObject *orderObj;
// orderObj = new OrderObject(this);
// orderObj->FromJson(order);
// m_ordersMap.insert(orderObj->order_id, orderObj);
// emit changeOrderStatus(orderObj);
// }while( query.next() );
// }
// query.clear();
// query.exec( QString("SELECT jsonStr from orders where orderId = 'freemud';") );
// if( query.next() )
// {
// m_timestamp = query.value(0).toString();
// }
// //
_PullOrder();
......@@ -205,8 +205,8 @@ bool FlowControl::_PullOrder()
emit setOpeStatus(strOpeStatus);
// 开启事务提高数据插入效率
m_db.transaction();
QSqlQuery query(m_db);
// m_db.transaction();
// QSqlQuery query(m_db);
// 获取订单信息
QJsonArray orders = recvJson[JSON_ORDERS].toArray();
......@@ -286,27 +286,27 @@ bool FlowControl::_PullOrder()
}
}
// 将订单数据存入本地
if(orderObject != NULL)
{
query.exec( QString("SELECT orderId from orders where orderId = '%1';").arg(orderObject->order_id) );
if( query.next() )
{
query.clear();
query.exec( QString("UPDATE orders SET jsonStr = '%1' WHERE orderId = '%2';")
.arg(orderObject->toString(), orderObject->order_id) );
QLOG_INFO() << "更新订单";
}else
{
query.clear();
query.exec( QString("INSERT INTO orders VALUES ('%1', '%2', '%3', 0, 0);")
.arg(orderObject->order_id,
QDateTime::fromTime_t(orderObject->create_time).toString("yyyy-MM-dd"),
QString(orderObject->toString())) );
QLOG_INFO() << "插入订单";
}
}
// if(orderObject != NULL)
// {
// query.exec( QString("SELECT orderId from orders where orderId = '%1';").arg(orderObject->order_id) );
// if( query.next() )
// {
// query.clear();
// query.exec( QString("UPDATE orders SET jsonStr = '%1' WHERE orderId = '%2';")
// .arg(orderObject->toString(), orderObject->order_id) );
// QLOG_INFO() << "更新订单";
// }else
// {
// query.clear();
// query.exec( QString("INSERT INTO orders VALUES ('%1', '%2', '%3', 0, 0);")
// .arg(orderObject->order_id,
// QDateTime::fromTime_t(orderObject->create_time).toString("yyyy-MM-dd"),
// QString(orderObject->toString())) );
// QLOG_INFO() << "插入订单";
// }
// }
......@@ -341,10 +341,10 @@ bool FlowControl::_PullOrder()
}
m_timestamp = recvJson[JSON_TIMESTAMPS].toString();
query.clear();
query.exec( QString("UPDATE orders SET jsonStr = '%1' WHERE orderId = 'freemud';")
.arg(m_timestamp) );
m_db.commit();
// query.clear();
// query.exec( QString("UPDATE orders SET jsonStr = '%1' WHERE orderId = 'freemud';")
// .arg(m_timestamp) );
//m_db.commit();
syncTime = recvJson[JSON_SYNCTIME].toInt()*1000;
}
}
......@@ -820,7 +820,7 @@ bool FlowControl::_CheckCashiers()
QString FlowControl::_GetJsonStr(const QJsonObject &json)
{
return QString(QJsonDocument(json).toJson(QJsonDocument::Compact)).replace("\"","");
return QString(QJsonDocument(json).toJson(QJsonDocument::Compact));
}
bool FlowControl::_RefundOrder(const QString &orderId, const QString &reason)
......
fmTakeaway/QsLog/QsLog.h
......@@ -66,7 +66,7 @@ public:
level(logLevel),
qtDebug(&buffer) {}
~Helper();
QDebug& stream(){ return qtDebug; }
QDebug& stream(){ return qtDebug.noquote(); }
private:
void writeToLog();
......
fmTakeaway/dailyform.cpp
......@@ -20,6 +20,12 @@ DailyForm::DailyForm(QWidget *parent) :
m_map.insert("eleme2", "饿了么 ");
m_map.insert("fmwd", "非码微店");
m_map.insert("mall", "APP ");
ui->daily_table0->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
ui->daily_table0->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
ui->daily_table1->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
ui->daily_table1->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
}
DailyForm::~DailyForm()
......@@ -57,10 +63,10 @@ void DailyForm::onShowDailyForm(QList<DailyStatement> infos)
QTableWidgetItem *num0 = new QTableWidgetItem(QString::number(info.total_number));
num0->setTextAlignment(Qt::AlignCenter);
ui->daily_table0->setItem(0, 1, num0);
QTableWidgetItem *fee0 = new QTableWidgetItem(QString::number((float)(info.product_fee_zps+info.product_fee)/100, 'f' , 2));
QTableWidgetItem *fee0 = new QTableWidgetItem(QString::number((float)(info.product_fee_zps+info.product_fee-info.discount_shop_fee-info.discount_shop_fee_zps)/100, 'f' , 1));
fee0->setTextAlignment(Qt::AlignCenter);
ui->daily_table0->setItem(0, 2, fee0);
tmp_printDate0.append(QString("%1*X%2*%3").arg(m_map.value(info.channel)).arg(info.total_number).arg(QString::number((float)(info.product_fee_zps+info.product_fee)/100, 'f' , 2)));
tmp_printDate0.append(QString("%1*X%2*%3").arg(m_map.value(info.channel)).arg(info.total_number).arg(QString::number((float)(info.product_fee_zps+info.product_fee-info.discount_shop_fee-info.discount_shop_fee_zps)/100, 'f' , 1)));
tmp_printDate0.append("$");
ui->daily_table1->insertRow(0);
......@@ -70,10 +76,10 @@ void DailyForm::onShowDailyForm(QList<DailyStatement> infos)
QTableWidgetItem *num1 = new QTableWidgetItem(QString("自配送"));
num1->setTextAlignment(Qt::AlignCenter);
ui->daily_table1->setItem(0, 1, num1);
QTableWidgetItem *fee1 = new QTableWidgetItem(QString::number((float)info.send_fee_zps/100, 'f' , 2));
QTableWidgetItem *fee1 = new QTableWidgetItem(QString::number((float)info.send_fee_zps/100, 'f' , 1));
fee1->setTextAlignment(Qt::AlignCenter);
ui->daily_table1->setItem(0, 2, fee1);
tmp_printDate1.append(QString("%1*自配送*%3").arg(m_map.value(info.channel)).arg(QString::number((float)info.send_fee_zps/100, 'f' , 2)));
tmp_printDate1.append(QString("%1*自配送*%3").arg(m_map.value(info.channel)).arg(QString::number((float)info.send_fee_zps/100, 'f' , 1)));
tmp_printDate1.append("$");
ui->daily_table1->insertRow(0);
......@@ -83,13 +89,13 @@ void DailyForm::onShowDailyForm(QList<DailyStatement> infos)
QTableWidgetItem *num2 = new QTableWidgetItem(QString("平台配送"));
num2->setTextAlignment(Qt::AlignCenter);
ui->daily_table1->setItem(0, 1, num2);
QTableWidgetItem *fee2 = new QTableWidgetItem(QString::number((float)info.send_fee/100, 'f' , 2));
QTableWidgetItem *fee2 = new QTableWidgetItem(QString::number((float)info.send_fee/100, 'f' , 1));
fee2->setTextAlignment(Qt::AlignCenter);
ui->daily_table1->setItem(0, 2, fee2);
tmp_printDate1.append(QString("%1*平台配送*%3").arg(m_map.value(info.channel)).arg(QString::number((float)info.send_fee/100, 'f' , 2)));
tmp_printDate1.append(QString("%1*平台配送*%3").arg(m_map.value(info.channel)).arg(QString::number((float)info.send_fee/100, 'f' , 1)));
tmp_printDate1.append("$");
shop_total_fee += info.product_fee_zps+info.product_fee;
shop_total_fee += info.product_fee_zps+info.product_fee-info.discount_shop_fee-info.discount_shop_fee_zps;
}
......@@ -100,7 +106,7 @@ void DailyForm::onShowDailyForm(QList<DailyStatement> infos)
// tmp_printDate1.append(QString("%1*X%2*%3").arg("总计 ").arg(channel1_total_num).arg(QString::number((float)channel1_total_fee/100, 'f' , 2)));
ui->daily_labTotalFee->setText(QString::number((float)shop_total_fee/100, 'f' , 2));
ui->daily_labTotalFee->setText(QString::number((float)shop_total_fee/100, 'f' , 1));
m_printDate.append(QString("门店号: %1").arg(FlowControl::GetInstance().storeId()));
m_printDate.append("|");
......@@ -110,7 +116,7 @@ void DailyForm::onShowDailyForm(QList<DailyStatement> infos)
m_printDate.append("|");
m_printDate.append(tmp_printDate1);
m_printDate.append("|");
m_printDate.append(QString("商品总金额: %1").arg(QString::number((float)shop_total_fee/100, 'f' , 2)));
m_printDate.append(QString("商品总金额: %1").arg(QString::number((float)shop_total_fee/100, 'f' , 1)));
m_printDate.append("|1");
show();
......
fmTakeaway/dailyform.ui
......@@ -244,7 +244,7 @@ background-color: #ffffff;
<rect>
<x>57</x>
<y>476</y>
<width>101</width>
<width>121</width>
<height>41</height>
</rect>
</property>
......@@ -264,7 +264,7 @@ background-color: #ffffff;
<widget class="QLabel" name="daily_labTotalFee">
<property name="geometry">
<rect>
<x>170</x>
<x>187</x>
<y>477</y>
<width>101</width>
<height>41</height>
......
fmTakeaway/mainForm.cpp
......@@ -125,7 +125,7 @@ void MainForm::_Init()
// 初始化文字
ui->mainLabStoreid->setText(UI_STOREID);
ui->mainLabVersion->setText("1.1.6");
ui->mainLabVersion->setText("1.1.8");
ui->mainLabCashier->setText(UI_CASHIER);
// 初始化表
......
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