Skip to content

T
takeout_sbk
Commit 0d8a919b by wuyang.zou
Options

fix bug

parent 4a4803f1
Showing with 120 additions and 38 deletions
fmTakeout/Control/flowControl.cpp
......@@ -1807,10 +1807,10 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
tempSbkAppPayValue = orderObject->payfmId;
}else if(1 == orderObject->payWay){
tempSbkAppPayType = 78;
tempSbkAppPayValue = (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("123456789");
tempSbkAppPayValue = (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("0");
}else if(2 == orderObject->payWay){
tempSbkAppPayType = 77;
tempSbkAppPayValue = (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("123456789");
tempSbkAppPayValue = (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("0");
}else{
tempSbkAppPayType = -1;
tempSbkAppPayValue = "-1";
......@@ -1840,11 +1840,11 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
cObj.insert("orderPayType", tempOrderPayType);
cObj.insert("sbkAppPayType", tempSbkAppPayType);
cObj.insert("sbkAppPayValue", tempSbkAppPayValue);
cObj.insert("orderTransFlowNo", (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("123456789") ); //第三方交易流水号
cObj.insert("orderTransFlowNo", (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("0") ); //第三方交易流水号
cObj.insert("packFree", orderObject->packageFee);
//防止出现 deliveryPrice: NUll
cObj.insert("deliveryFree", (orderObject->deliveryPrice>0 && orderObject->deliveryPrice<10000)?orderObject->deliveryPrice:0);
cObj.insert("waybillId", (orderObject->waybillId).length()?orderObject->waybillId:QString("123456") );
cObj.insert("waybillId", (orderObject->waybillId).length()?orderObject->waybillId:QString("0") );
cObj.insert("pos_sale_id", orderObject->posCheckNo);
cObj.insert("order_status",orderObject->orderStatus);//订单的状态
cObj.insert("pay_ebcode", orderObject->channel);
......@@ -1878,6 +1878,11 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
cObj.insert("shop_fee", /*orderObject->total_fee-orderObject->send_fee-orderObject->service_fee-orderObject->dis_shop_fee*/0); // 商户能够拿到的钱(去除平台佣金)
cObj.insert("package_fee", orderObject->totalPrice); // 打包费
cObj.insert("invoice_amount",orderObject->totalPrice);
if("ELE"==orderObject->channel){
cObj.insert("thirdPartyOrderId",orderObject->thirdPartyOrderId);
}else{
cObj.insert("thirdPartyOrderId","0");
}
cObj.insert("paid_trans_id",orderObject->id);
//cObj.insert("fm_id",orderObject->fm_id);
rObj.insert("pay_id", cObj);
......
fmTakeout/DTools/printSumBillPosDB.cpp
......@@ -72,12 +72,12 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
query.addBindValue(orderObj->addressDetail); // --收货者
query.addBindValue(orderObj->consigneePhone); // --收货者-电话
query.addBindValue(orderObj->id); // --订单编号
query.addBindValue((orderObj->waybillId).length()?orderObj->waybillId:QString("123456") ); // --物流编号
query.addBindValue((orderObj->waybillId).length()?orderObj->waybillId:QString("0") ); // --物流编号
query.addBindValue((orderObj->pickupCode).length()?orderObj->pickupCode.toInt():0 ); // --取餐号；
query.addBindValue(orderObj->riderPhone); // --配送者电话
query.addBindValue(orderObj->riderName); // -配送者名称
QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill waybillId:%1-->>>>]").arg((orderObj->waybillId).length()?orderObj->waybillId:QString("123456"));
QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill waybillId:%1-->>>>]").arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0"));
if(!query.exec())
{
......@@ -91,7 +91,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
.arg(orderObj->lastName).arg(orderObj->customerName).arg(temp_customerSex)
.arg(0).arg(qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd hh:mm:ss")).arg(FlowControl::GetInstance()._GetCashierId()).arg("").arg("")
.arg(orderObj->consigneeName).arg(orderObj->addressDetail).arg(orderObj->consigneePhone).arg(orderObj->id)
.arg((orderObj->waybillId).length()?orderObj->waybillId:QString("123456")).arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt()).arg(orderObj->riderPhone).arg(orderObj->riderName);
.arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0")).arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt()).arg(orderObj->riderPhone).arg(orderObj->riderName);
} else {
QLOG_INFO()<<QString("[<<<<---SqlServer Database:Insert OrderId %1 Into customer_info Success--->>>>]").arg(orderObj->id);
result = true;
......
fmTakeout/DTools/util.cpp
......@@ -7,6 +7,12 @@ QString Penny2Dollar(int penny)
return QString::number(dollar,'f',2);
}
double Penny2Dollar2Double(int penny)
{
double dollar = (double)penny/100;
return QString::number(dollar,'f',2).toDouble();
}
QString GetOperByStatus(int status, bool bRefuse)
{
switch(status)
......
fmTakeout/DTools/util.h
......@@ -8,6 +8,13 @@
* 返回:元
* */
QString Penny2Dollar(int penny);
/* 功能:将【分】转化为【元】
* 参数:[1]分
* 返回:元
**/
double Penny2Dollar2Double(int penny);
/* 功能:根据订单状态获取操作码
* 参数:[1]订单状态
* 返回:元
......
fmTakeout/Model/orderObject.cpp
......@@ -69,13 +69,13 @@ void OrderObject::FetchDataFromJson(const QJsonObject &json)
QString OrderObject::getChannelName()
{
QLOG_INFO() << QString("[<<<<---OrderObject:getChannelName [%3]--->>>>]").arg(channel);
if ("MOD" == channel){
if ("MOD" == channel && 3 != orderType){
return QString::fromLocal8Bit("星巴克");
}else if("ELE" == channel){
return QString::fromLocal8Bit("饿了么");
}else if("BAIDU" == channel){
return QString::fromLocal8Bit("百度外卖");
}else if(3 == orderType){
}else if("MOD" == channel && 3 == orderType){
return QString::fromLocal8Bit("客诉单");
}
else{
......
fmTakeout/Model/orderObject.h
......@@ -13,6 +13,8 @@ class OrderObject : public QObject
Q_PROPERTY (QString id READ getId WRITE setId)
Q_PROPERTY (QString payfmId READ getPayfmId WRITE setPayfmId)
Q_PROPERTY (QString thirdPartyBatch READ getThirdPartyBatch WRITE setThirdPartyBatch)
Q_PROPERTY (QString thirdPartyOrderId READ getThirdPartyOrderId WRITE setThirdPartyOrderId)
Q_PROPERTY (int orderType READ getOrderType WRITE setOrderType)
Q_PROPERTY (QString orgOrderId READ getOrgOrderId WRITE setOrgOrderId)
Q_PROPERTY (QString waybillId READ getWaybillId WRITE setWaybillId)
......@@ -90,6 +92,7 @@ public:
QString id; //编号
QString payfmId; //FM唯一码
QString thirdPartyBatch ; //第三方交易流水号
QString thirdPartyOrderId; //第三方订单ID
int orderType; //订单类型: 用来区分是 正常订单(1) 预订单(2) 还是 客诉单:3 (星巴克定义客诉单的类型:12);
QString orgOrderId; //原始订单编号
QString waybillId ; //运单号
......@@ -156,6 +159,8 @@ public:
inline QString getThirdPartyBatch()const{return thirdPartyBatch;}
inline void setThirdPartyBatch(const QString& v){thirdPartyBatch = v;}
inline QString getThirdPartyOrderId()const{return thirdPartyOrderId;}
inline void setThirdPartyOrderId(const QString& v){thirdPartyOrderId = v;}
inline int getOrderType()const{return orderType;}
inline void setOrderType(const int& v){orderType = v;}
......
fmTakeout/detailForm.cpp
......@@ -48,33 +48,49 @@ void DetailForm::InitData(OrderObject *orderObject)
ui->detailLab6->setText(orderObject->needInvoice? orderObject->invoiceTitle : QString::fromLocal8Bit("不需要发票"));
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;
for(; i<orderObject->proList.count(); i++)
int i = 0, pNum = 0;
for(; i<orderObject->proList.count(); i++,pNum++)
{
ui->detailTable0->insertRow(i);
ui->detailTable0->setItem(i, 0, new QTableWidgetItem(GetProductName(orderObject->proList.at(i)))); // 商品名
ui->detailTable0->item(i, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price))); // 价格
ui->detailTable0->item(i, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->qty))); // 数量
ui->detailTable0->item(i, 2)->setTextAlignment(Qt::AlignCenter);
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);
ui->detailTable0->setItem(pNum, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->qty))); // 数量
ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignCenter);
/*
// 选项太多,不便于显示;
int j = 0;
dishesObject* tempDishObj = orderObject->proList[i];
for(; j<tempDishObj->sub_products.count(); j++)
{
pNum++;
ui->detailTable0->insertRow(pNum);
ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(GetProductName(tempDishObj->sub_products.at(j)))); // 商品名
ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(Penny2Dollar(tempDishObj->sub_products.at(j)->price))); // 价格
ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum, 2, new QTableWidgetItem(QString::number(tempDishObj->sub_products.at(j)->qty))); // 数量
ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignCenter);
}
*/
}
// 新增配送费 + 打包费
ui->detailTable0->insertRow(i);
ui->detailTable0->setItem(i, 0, new QTableWidgetItem(QString::fromLocal8Bit("配送费"))); // 配送费
ui->detailTable0->item(i, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i, 1, new QTableWidgetItem(Penny2Dollar(orderObject->deliveryPrice))); // 价格
ui->detailTable0->item(i, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i, 2, new QTableWidgetItem(QString::number(1))); // 数量
ui->detailTable0->item(i, 2)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->insertRow(i+1);
ui->detailTable0->setItem(i+1, 0, new QTableWidgetItem(QString::fromLocal8Bit("包装费"))); // 包装费
ui->detailTable0->item(i+1, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i+1, 1, new QTableWidgetItem(Penny2Dollar(orderObject->packageFee))); // 价格
ui->detailTable0->item(i+1, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i+1, 2, new QTableWidgetItem(QString::number(1))); // 数量
ui->detailTable0->item(i+1, 2)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->insertRow(pNum);
ui->detailTable0->setItem(pNum, 0, new QTableWidgetItem(QString::fromLocal8Bit("配送费"))); // 配送费
ui->detailTable0->item(pNum, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum, 1, new QTableWidgetItem(Penny2Dollar(orderObject->deliveryPrice))); // 价格
ui->detailTable0->item(pNum, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum, 2, new QTableWidgetItem(QString::number(1))); // 数量
ui->detailTable0->item(pNum, 2)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->insertRow(pNum+1);
ui->detailTable0->setItem(pNum+1, 0, new QTableWidgetItem(QString::fromLocal8Bit("包装费"))); // 包装费
ui->detailTable0->item(pNum+1, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum+1, 1, new QTableWidgetItem(Penny2Dollar(orderObject->packageFee))); // 价格
ui->detailTable0->item(pNum+1, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(pNum+1, 2, new QTableWidgetItem(QString::number(1))); // 数量
ui->detailTable0->item(pNum+1, 2)->setTextAlignment(Qt::AlignCenter);
//TODO
// QString records;
......
fmTakeout/mainForm.cpp
......@@ -4,6 +4,7 @@
#include "preDefine.h"
#include "Control/flowControl.h"
#include "QsLog.h"
#include <QScrollBar>
#include "DTools/util.h"
#include <QList>
#include <QMap>
......@@ -164,6 +165,20 @@ void MainForm::_Init()
m_prevTable = ui->mainTableNew;
m_currentTable = ui->mainTableNew;
ui->mainBtnSet->hide();
// 特别处理点击表中排序问题;
_TableWidgetHeaderClickConnect();
}
void MainForm::_TableWidgetHeaderClickConnect(){
foreach(QTableWidget *table, m_tableList) {
connect(table->horizontalHeader(), SIGNAL(sectionClicked(int)), this, SLOT(_onTableWidgetHeaderClick(int)));
}
}
void MainForm::_onTableWidgetHeaderClick(int index){
QLOG_INFO() << QString("[<<<<---MainForm::_onTableWidgetHeaderClick: head index:%1 --->>>>]").arg(index);
m_currentTable->verticalScrollBar()->setValue(0);
}
void MainForm::onSetCurrentTime()
......@@ -398,9 +413,17 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
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(Penny2Dollar(orderObject->totalPrice));
QTableWidgetItem *item2 = new QTableWidgetItem();
item2->setData(Qt::DisplayRole, Penny2Dollar2Double(orderObject->totalPrice));
item2->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 2, item2); // 金额
table->item(0,2)->setFlags(table->item(0,2)->flags() & (~Qt::ItemIsEditable));
//QTableWidgetItem *item3 = new QTableWidgetItem(orderObject->customerName);
QTableWidgetItem *item3 = new QTableWidgetItem(orderObject->consigneeName);
item3->setTextAlignment(Qt::AlignCenter);
......
fmTakeout/mainForm.h
......@@ -146,6 +146,13 @@ private slots:
* 返回:NULL
* */
void _Init();
/* 功能:用来绑定 QTableWidget horizontalHeader click 排序前，信号与槽的初始化;
* 参数:NULL
* 返回:NULL
* */
void _TableWidgetHeaderClickConnect();
/* 功能:设置当前时间
* 参数:NULL
* 返回:NULL
......@@ -267,6 +274,14 @@ public slots:
* 参数:[1]订单搜索结果
* 返回:NULL
* */
/* 功能:QTableWidget horizontalHeader click 触发信号 sectionClicked(int)对应的槽 函数;
* 参数:NULL
* 返回:NULL
* */
void _onTableWidgetHeaderClick(int index);
void onShowSearchOrderResult(const QMap<QString, QString> &orderIdList);
void onOrderClear(const QString& orderId,const int& oldstatus);
void onSetDailyReportData(QJsonObject json);
......
fmTakeout/preDefine.h
......@@ -5,7 +5,8 @@
#define APP_THEME "deaufult"
#define APP_VERSION "1.20171013.01"
//#define APP_VERSION "1.20171013.01"
#define APP_VERSION "2.20180822.01"
#define SERVER_PASSWORD "posoperator@freemud.cn"
#define CONFIG_NAME "config.ini"
......
run/config.ini
[FmServer]
;<<<非码POS插件:登陆注册+5分钟心跳 服务器地址>>>
loginUrl=https://delposservice.starbucks.net/backstage/pos/
;星巴克测试环境：http://delposservice.stg.starbucks.net/pos/
;<<<非码POS插件:登陆注册+5分钟心跳 服务器地址>>>
loginUrl=https://delposservice.starbucks.net/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/
[Interface]
;接口名称
......
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