Skip to content

T
takeout_sbk
Commit 71598178 by wuyang.zou
Options

fix bug: 隐藏发票信息，显示第三方订单编号，更新配置文件 git仓库的管理

parent 0d8a919b
Showing with 78 additions and 43 deletions
fmTakeout/Control/flowControl.cpp
......@@ -1891,43 +1891,48 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
{
QJsonObject tObj;
dishesObject* dish=orderObject->proList.at(i);
if (orderObject->proList.at(i)->code.contains("Default",Qt::CaseSensitive)){
//默认属性直接跳过;
if (orderObject->proList.at(i)->code.contains("Default",Qt::CaseSensitive)) {
continue;
}
tObj.insert("consume_num", orderObject->proList.at(i)->qty);
tObj.insert("pid", orderObject->proList.at(i)->code);
tObj.insert("original_price", orderObject->proList.at(i)->price);
// begin 整合子商品开始；
QJsonArray subProduct;
QJsonObject sObj;
// 处理原始的配料信息;
if(!dish->sub_products.isEmpty())
{
for(int j=0; j < dish->sub_products.count(); j++)
//针对同一商品，多份数量需要将其，拆分成单份;[如果不拆分，将导致多份商品中配料价格出现 漏钱:POS中的账将会出现少金额]
for (int temp_qty = 0; temp_qty < orderObject->proList.at(i)->qty; temp_qty++) {
//tObj.insert("consume_num", orderObject->proList.at(i)->qty);
tObj.insert("consume_num", 1);
tObj.insert("pid", orderObject->proList.at(i)->code);
tObj.insert("original_price", orderObject->proList.at(i)->price);
// begin 整合子商品开始；
QJsonArray subProduct;
QJsonObject sObj;
// 处理原始的配料信息;
if(!dish->sub_products.isEmpty())
{
dishesObject* subDish=dish->sub_products.at(j);
if(!subDish->code.isEmpty() && !subDish->code.contains("Default",Qt::CaseSensitive) )
for(int j=0; j < dish->sub_products.count(); j++)
{
sObj.insert("consume_num", subDish->qty);
sObj.insert("pid", subDish->code);
sObj.insert("original_price", subDish->price);
subProduct.insert(0, sObj);
dishesObject* subDish=dish->sub_products.at(j);
//默认属性直接跳过;
if(!subDish->code.isEmpty() && !subDish->code.contains("Default",Qt::CaseSensitive) )
{
sObj.insert("consume_num", subDish->qty);
sObj.insert("pid", subDish->code);
sObj.insert("original_price", subDish->price);
subProduct.insert(0, sObj);
}
}
}
// 处理商品的属性(热 -> 特别热)的额外配料信息;
if(orderObject->proList.at(i)->options.length()){
sObj.insert("consume_num", 1);
sObj.insert("pid", orderObject->proList.at(i)->options);
sObj.insert("original_price", 0);
subProduct.insert(0, sObj);
}
// 汇总插入子商品[sub_products];
if(subProduct.size()){
tObj.insert("sub_products",subProduct);
} // end 整合子商品结束；
products.insert(i, tObj);
}
// 处理商品的属性(热 -> 特别热)的额外配料信息;
if(orderObject->proList.at(i)->options.length()){
sObj.insert("consume_num", 1);
sObj.insert("pid", orderObject->proList.at(i)->options);
sObj.insert("original_price", 0);
subProduct.insert(0, sObj);
}
// 汇总插入子商品[sub_products];
if(subProduct.size()){
tObj.insert("sub_products",subProduct);
} // end 整合子商品结束；
products.insert(i, tObj);
}
rObj.insert("products", products);
data= rObj;
......
fmTakeout/Model/orderObject.cpp
......@@ -62,7 +62,6 @@ void OrderObject::FetchDataFromJson(const QJsonObject &json)
{
setProperty(key.toUtf8(), json[key].toVariant());
}
return;
}
......
fmTakeout/detailForm.cpp
......@@ -39,13 +39,28 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailLab0->setText(QString("[%1 # %2][%3][%4]").arg(QString::number(orderObject->orderIndex),orderObject->getChannelName(),
orderObject->getOrderStatusDec(),
orderObject->id));
QLOG_INFO() << QString("[<<<<---DetailForm::InitData ui->detailLab0->setText --->>>>]");
ui->detailLab1->setText(QString("%1:%2").arg(orderObject->consigneeName,orderObject->consigneePhone));
ui->detailLab2->setText(orderObject->deliveryTime.isEmpty()? QString::fromLocal8Bit("立即送出") : orderObject->deliveryTime);
//订单完成后,送达时间需要更新为 finishTime
if(OrderObject::Finished == orderObject->orderStatus){
ui->detailLab2->setText( (orderObject->finishTime.isEmpty() || 0==orderObject->finishTime.length() )? QString::fromLocal8Bit("已经送达") : orderObject->finishTime);
}else{
ui->detailLab2->setText(orderObject->deliveryTime.isEmpty()? QString::fromLocal8Bit("立即送出") : orderObject->deliveryTime);
}
//ui->detailLab2->setText(orderObject->deliveryTime.isEmpty()? QString::fromLocal8Bit("立即送出") : orderObject->deliveryTime);
QLOG_INFO() << QString("[<<<<---DetailForm::InitData ui->detailLab2->setText --->>>>]");
ui->detailLab3->setText(orderObject->riderName.isEmpty() ? QString::fromLocal8Bit("暂未指定") : QString::fromLocal8Bit("[姓名]%1 [电话]%2")
.arg(orderObject->riderName, orderObject->riderPhone));
//TODO
ui->detailLab4->setText(Penny2Dollar(orderObject->totalPrice));
ui->detailLab6->setText(orderObject->needInvoice? orderObject->invoiceTitle : QString::fromLocal8Bit("不需要发票"));
//先隐藏发票信息
//ui->detailLab6->setText(orderObject->needInvoice? orderObject->invoiceTitle : QString::fromLocal8Bit("不需要发票"));
ui->detailSlab6->setText(QString::fromLocal8Bit("三方订单号"));
ui->detailLab6->setText(orderObject->thirdPartyOrderId);
QLOG_INFO() << QString("[<<<<---DetailForm::InitData ui->detailSlab6 --->>>>]");
ui->detailLab7->setText(orderObject->msr_no.length()? orderObject->msr_no : orderObject->customerId); // MSR_NO
ui->detailLab5->setText(QString("[%1]").arg(orderObject->memo));
int i = 0, pNum = 0;
......@@ -54,8 +69,18 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailTable0->insertRow(pNum);
ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(GetProductName(orderObject->proList.at(i)))); // 商品名
ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price))); // 价格
ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
//客诉单商品价格需要显示为 0；
if("MOD" == orderObject->channel && 3 == orderObject->orderType){
ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(QString("0")));
ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
}else{
ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price))); // 价格
ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
}
QLOG_INFO() << QString("[<<<<---DetailForm::InitData ui->detailTable0 --->>>>]");
//ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price))); // 价格
//ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->qty))); // 数量
ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignCenter);
/*
......
fmTakeout/mainForm.cpp
......@@ -410,12 +410,12 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
QTableWidgetItem *item0 = new QTableWidgetItem(orderObject->getChannelName());
item0->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 0, item0); // 渠道
QTableWidgetItem *item1 = new QTableWidgetItem(orderObject->id);
item1->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 1, item1); // 订单ID
//QTableWidgetItem *item2 = new QTableWidgetItem(Penny2Dollar(orderObject->totalPrice));
QTableWidgetItem *item2 = new QTableWidgetItem();
item2->setData(Qt::DisplayRole, Penny2Dollar2Double(orderObject->totalPrice));
......
fmTakeout/preDefine.h
......@@ -6,7 +6,8 @@
#define APP_THEME "deaufult"
//#define APP_VERSION "1.20171013.01"
#define APP_VERSION "2.20180822.01"
//#define APP_VERSION "2.20180822.01"
#define APP_VERSION "2.20180824.01"
#define SERVER_PASSWORD "posoperator@freemud.cn"
#define CONFIG_NAME "config.ini"
......
run/config.ini
[FmServer]
;<<<非码POS插件:登陆注册+5分钟心跳 服务器地址>>>
loginUrl=https://delposservice.starbucks.net/pos/
loginUrl=https://delposservice.starbucks.net/backstage/pos/
;星巴克开发环境：loginUrl=http://10.92.194.44:8083/backstage/pos/
;星巴克测试环境：loginUrl=http://delposservice.stg.starbucks.net/pos/
;星巴克生产环境：loginUrl=https://delposservice.starbucks.net/pos/
;<<<非码外卖拉取订单服务器地址>>>
orderUrl=https://deliveryapi.starbucks.net/assortment/order/
;星巴克测试环境: orderUrl=https://deliveryapi.stg.starbucks.net/assortment/order/
;星巴克开发环境: orderUrl=https://deliveryapi.dev.starbucks.net/assortment/order/
;星巴克生产环境: orderUrl=https://deliveryapi.starbucks.net/assortment/order/
orderUrl=https://delposservice.starbucks.net/backstage/order/
;星巴克测试环境: orderUrl=https://delposservice.stg.starbucks.net/backstage/order/
;星巴克开发环境: orderUrl=https://delposservice.dev.starbucks.net/backstage/order/
;星巴克生产环境: orderUrl=https://delposservice.starbucks.net/backstage/order/
[Interface]
;接口名称
......
run/userConfig.ini
[Float]
postion=@Point(1177 24)
postion=@Point(80 500)
opacity=0.5
blinkInterval=0.3
soundInterval=2
......@@ -14,4 +14,9 @@ database=zhy
name=Microsoft XPS Document Writer
[OmsBtn]
;postion=@Point(1350 720) 此位置屏蔽，使用相对坐标(相对偏移)来解决了；需要注意后期减去相对偏移的值来定位坐标[目前支持:大屏1366*768 ;小屏: 1024*768 ];
widthoffset=16
heightoffset=48
postion=@Point(1350 720)
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