Skip to content

F
fmtakeout
Commit 305bc828 by 李定达
Options

1.对接外卖接口;2.订单显示流程调整;

parent c31d2ce8
Showing with 73 additions and 11 deletions
takeout/base/Arithmetic/util.cpp
......@@ -80,7 +80,7 @@ QString GetOperNameByStatus(int status, bool bRefuse)
{
return QString::fromLocal8Bit(OPERATIONNAME_REFUNDORDER);
}
return QString::fromLocal8Bit(OPERATIONNAME_SENDOUT);
return QString::fromLocal8Bit(OPERATIONNAME_COMPLETE);
break;
case 4:
if(bRefuse)
......
takeout/takeout.rc
......@@ -4,8 +4,8 @@
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,0
PRODUCTVERSION 2,0,0,0
FILEVERSION 2,0,0,1
PRODUCTVERSION 2,0,0,1
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.0"
VALUE "FileVersion", "2.0.0.1"
VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "2.0.0.0"
VALUE "ProductVersion", "2.0.0.1"
END
END
BLOCK "VarFileInfo"
......
takeout/view/detailForm.cpp
......@@ -11,6 +11,7 @@
#include "event/fmapplication.h"
#include "event/posevent.h"
#include "QsLog.h"
DetailForm::DetailForm(QWidget *parent) :
QDialog(parent),
......@@ -57,11 +58,11 @@ void DetailForm::InitData(OrderObject *orderObject)
// ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? QString::fromLocal8Bit("暂未指定") : QString::fromLocal8Bit("[姓名]%1 [电话]%2")
// .arg(orderObject->courier_name, orderObject->courier_phone));
if(orderObject->disList.size() > 0)
ui->detailLab6->setText(QString::number((-orderObject->disList[0]->price)/100.0, 'f' , 2).append(QString::fromLocal8Bit("(元)")));
ui->detailLab6->setText(QString::number((orderObject->discount_fee)/100.0, 'f' , 2).append(QString::fromLocal8Bit("(元)")));
else
ui->detailLab6->setText("0");
ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));
ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->user_fee));
ui->detailLab8->setText(orderObject->has_invoiced? QString::fromLocal8Bit("发票抬头:%1").arg(orderObject->invoice_title) : QString::fromLocal8Bit("不需要发票"));
ui->detailLab8_3->setText(QString::fromLocal8Bit("%1").arg(QString::number(orderObject->package_fee / 100.0, 'f', 2).append(QString::fromLocal8Bit("(元)"))));
......@@ -113,6 +114,12 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailBtn2->setText(GetOperNameByStatus(orderObject->status, true));
ui->detailBtn2->setProperty("operation", GetOperByStatus(orderObject->status, true));
ui->detailBtn2->setProperty("orderId", orderObject->order_id);
if(ui->detailBtn2->text().compare(QString::fromLocal8Bit(OPERATIONNAME_REFUNDORDER)) == 0)
ui->detailBtn2->hide();
else
ui->detailBtn2->show();
if(/*orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&&*/ orderObject->status != 4)
{
ui->detailBtn2->hide();
......@@ -121,9 +128,32 @@ void DetailForm::InitData(OrderObject *orderObject)
// {
// ui->detailBtn0->hide();
// }
// if(ui->detailBtn3->text().compare(QString::fromLocal8Bit(OPERATIONNAME_MAKEOVER)) == 0 &&
// (orderObject->order_type == 1 || orderObject->order_type == 2))
// {
// ui->detailBtn3->hide();
// }
// else
// ui->detailBtn3->show();
ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status));
ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status));
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)
{
ui->detailBtn3->setText(QString::fromLocal8Bit(OPERATIONNAME_SENDOUT));
ui->detailBtn3->setProperty("operation", OPERATION_SENDOUT);
}
if(orderObject->status == 5 || orderObject->status == 4)
{
ui->detailBtn3->setText(QString::fromLocal8Bit(OPERATIONNAME_COMPLETE));
ui->detailBtn3->setProperty("operation", OPERATION_COMPLETE);
}
if(!GetOperByStatus(orderObject->status).compare("NULL"))
{
......@@ -148,6 +178,16 @@ void DetailForm::onOperaBtnClicked()
{
hide();
QPushButton *pBtn = (QPushButton*)sender();
// if((pBtn->property("ordertype").toInt() == 1 || pBtn->property("ordertype").toInt() == 2) &&
// pBtn->property("operation").toString().compare(OPERATION_MAKEOVER, Qt::CaseInsensitive) == 0)
// {
// QLOG_DEBUG() << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << "operation : " << pBtn->property("operation").toString() << "; ordertype : " << pBtn->property("ordertype").toInt();
// return ;
// }
//QLOG_INFO() << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << "operation : " << pBtn->property("operation").toString() << "; ordertype : " << pBtn->property("ordertype").toInt();
if(m_rejectForm==NULL){m_rejectForm = new RejectForm(this);}
// if(pBtn->text()=="拒单")
......
takeout/view/mainForm.cpp
......@@ -336,6 +336,16 @@ void MainForm::onMainProcBtnClicked()
// }
// else
// emit processOrder(pBtn->property("operation").toString(), pBtn->property("orderId").toString(), DeliverObject());
// if((pBtn->property("ordertype").toInt() == 1 || pBtn->property("ordertype").toInt() == 2) &&
// pBtn->property("operation").toString().compare(OPERATION_MAKEOVER, Qt::CaseInsensitive) == 0)
// {
// QLOG_DEBUG() << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << "operation : " << pBtn->property("operation").toString() << "; ordertype : " << pBtn->property("ordertype").toInt();
// return ;
// }
//QLOG_INFO() << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << "operation : " << pBtn->property("operation").toString() << "; ordertype : " << pBtn->property("ordertype").toInt();
QVariantMap value;
value.insert(EVENT_KEY_ORDERID, pBtn->property("orderId").toString());
......@@ -619,8 +629,20 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
pBtn->setFocusPolicy(Qt::NoFocus);
pBtn->setObjectName("mainProcBtn");
pBtn->setProperty("orderId", orderObject->order_id);
pBtn->setProperty("operation", table->property("operation").toString());
pBtn->setText(table->property("operationName").toString());
pBtn->setProperty("ordertype", orderObject->order_type);
if(table->property("operation").toString().compare(OPERATION_MAKEOVER, Qt::CaseInsensitive) == 0 &&
(orderObject->order_type == 1 || orderObject->order_type == 2))
{
pBtn->setProperty("operation", OPERATION_SENDOUT);
pBtn->setText(QString::fromLocal8Bit(OPERATIONNAME_SENDOUT));
}
else
{
pBtn->setProperty("operation", table->property("operation").toString());
pBtn->setText(table->property("operationName").toString());
}
hLayout->addWidget(pBtn);
hLayout->setMargin(0);
pWdg->setLayout(hLayout);
......
takeout/view/mainForm.ui
......@@ -764,10 +764,10 @@
<bool>false</bool>
</property>
<property name="operationName" stdset="0">
<string>送出</string>
<string>完成</string>
</property>
<property name="operation" stdset="0">
<string>sendOut</string>
<string>complete</string>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
......
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