fix bug : 完善 退款完成到 异常单表中，同时增加显示异常单中订单状态信息

fmTakeout/Model/orderObject.cpp

 #include "orderObject.h"
 #include "preDefine.h"
+#include "QsLog.h"
 #include <QJsonArray>
 OrderObject::OrderObject(const OrderObject &order, QObject *parent):QObject(parent)
 {
@@ -67,16 +68,16 @@ void OrderObject::FetchDataFromJson(const QJsonObject &json)
 
 QString OrderObject::getChannelName()
 {
-    int value = channel.toInt();
-    qDebug()<<"value----------"<<value;
-    switch(value)
-    {
-        case 1:return QString::fromLocal8Bit("星巴克");
-        case 2:return QString::fromLocal8Bit("饿了么");
-        case 3:return QString::fromLocal8Bit("客诉单"); //百度外卖
-        deafult: return QString::fromLocal8Bit("未知");
+    QLOG_INFO() << QString("[<<<<---OrderObject:getChannelName [%3]--->>>>]").arg(channel);
+    if ("MOD" == channel){
+        return QString::fromLocal8Bit("星巴克");
+    }else if("ELE" == channel){
+        return QString::fromLocal8Bit("饿了么");
+    }else if("BAIDU" == channel){
+        return QString::fromLocal8Bit("百度外卖");
+    }else{
+        return QString::fromLocal8Bit("未知");
     }
-    return QString::fromLocal8Bit("未知");
 }
 
 QString OrderObject::getOrderStatusDec()

fmTakeout/mainForm.cpp

@@ -285,7 +285,7 @@ QPushButton *MainForm::_GetTabBtnByOrderStatus(int orderStatus)
         return ui->mainBtnMake;
         break;
     case OrderObject::Refunded:
-        return ui->mainBtnFinsh;
+        return ui->mainBtnUnusual;
         break;
     case OrderObject::Sendout:
         return ui->mainBtnSend;
@@ -399,8 +399,8 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
     table->setItem(0, 5, item5);  // 下单时间
     if(table != ui->mainTableFinsh)
     {
-        // 订单已经支付，等待接单的订单;
-        if(2==orderObject->orderStatus)
+        // 订单已经支付待接单的订单 + 已经接单的订单 + 已经配送的订单;
+        if(2==orderObject->orderStatus || 3==orderObject->orderStatus || 4==orderObject->orderStatus)
         {
             qDebug()<<table->objectName()<<"------";
             QWidget *pWdg = new QWidget(table);
@@ -418,8 +418,8 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
             table->setCellWidget(0, 6, pWdg);   // 操作按钮
             connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
         }
-        // 已经接单的订单;
-        if(3==orderObject->orderStatus)
+        // 已经取消的订单 + 商家已经退款的订单;
+        if(6==orderObject->orderStatus)
         {
             qDebug()<<table->objectName()<<"------";
             QWidget *pWdg = new QWidget(table);
@@ -429,13 +429,34 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
             pBtn->setFocusPolicy(Qt::NoFocus);
             pBtn->setObjectName("mainProcBtn");
             pBtn->setProperty("orderId", orderObject->id);
-            pBtn->setProperty("operation", table->property("operation").toString());
-            pBtn->setText(table->property("operationName").toString());
+            //pBtn->setProperty("operation", table->property("operation").toString());
+            pBtn->setText(QString::fromLocal8Bit("已退款"));
+            pBtn->setDisabled(true);
             hLayout->addWidget(pBtn);
             hLayout->setMargin(0);
             pWdg->setLayout(hLayout);
             table->setCellWidget(0, 6, pWdg);   // 操作按钮
-            connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
+            //connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
+        }
+        // 已下单待支付;
+        if(1==orderObject->orderStatus)
+        {
+            qDebug()<<table->objectName()<<"------";
+            QWidget *pWdg = new QWidget(table);
+            QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
+            QPushButton * pBtn = new QPushButton(pWdg);
+            pBtn->setFixedSize(70, 30);
+            pBtn->setFocusPolicy(Qt::NoFocus);
+            pBtn->setObjectName("mainProcBtn");
+            pBtn->setProperty("orderId", orderObject->id);
+            //pBtn->setProperty("operation", table->property("operation").toString());
+            pBtn->setText(QString::fromLocal8Bit("待支付"));
+            pBtn->setDisabled(true);
+            hLayout->addWidget(pBtn);
+            hLayout->setMargin(0);
+            pWdg->setLayout(hLayout);
+            table->setCellWidget(0, 6, pWdg);   // 操作按钮
+            //connect(pBtn, &QPushButton::clicked, this, &MainForm::onMainProcBtnClicked);
         }
     }