fix bug : 不记得了

fmTakeout/DTools/dataManger.cpp

@@ -151,7 +151,7 @@ QJsonObject DataManger::GetRefundOrderData(int reasonCode,const QString &reason,
         }
         rObj.insert(JSON_ORDERID, orderId);
         rObj.insert("productIds", productIds);
-        rObj.insert("canceledCause", reason);
+        rObj.insert("canceledCause", reasonCode);
         rObj.insert(JSON_POSIPADDRESS,QString("http://") + m_posIpAddress);
     }
     // 其他退单原因;

fmTakeout/DTools/simProcOrderDB.cpp

@@ -87,7 +87,7 @@ bool SimProcOrderDB::updatePushOrderStatus(const QString &orderId, const int &pu
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("[<<<<---Sqlite Database:Update OrderId %1 pushOrderStatus success--->>>>]").arg(orderId);
+        QLOG_INFO()<<QString("[<<<<---Sqlite Database:Update OrderId %1 pushOrderStatus success;pushOrderStatus:%2--->>>>]").arg(orderId).arg(pushOrderStatus);
         result = true;
     }
     db.close();
@@ -114,6 +114,7 @@ bool SimProcOrderDB::isPushedOrder(const QString &orderId)
     while(query.next())
     {
         result= query.value(0).toBool();
+        QLOG_INFO()<<QString("[<<<<---Sqlite Database:isPushedOrder  orderId:%1  isPushedOrder:%2  --->>>>]").arg(orderId).arg(result);
     }
     db.close();
     m_mutex.unlock();
@@ -138,7 +139,7 @@ bool SimProcOrderDB::updateRefundOrderStatus(const QString &orderId, const int &
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("[<<<<---Sqlite Database:Update OrderId %1 refundOrderStatus Successd--->>>>]").arg(orderId);
+        QLOG_INFO()<<QString("[<<<<---Sqlite Database:Update OrderId %1 refundOrderStatus Successd; refundOrderStatus:%2  --->>>>]").arg(orderId).arg(refundOrderStatus);
         result = true;
     }
     db.close();
@@ -165,6 +166,7 @@ bool SimProcOrderDB::isRefundOrder(const QString &orderId)
     while(query.next())
     {
         result= query.value(0).toBool();
+        QLOG_INFO()<<QString("[<<<<---SimProcOrderDB::isRefundOrder:  orderId:%1, isRefundOrder:%2--->>>>]").arg(orderId).arg(result);
     }
     db.close();
     m_mutex.unlock();
@@ -318,7 +320,7 @@ bool SimProcOrderDB::updatePosOrderCheckNo(const QString &orderId, const QString
         result= false;
     }
     else{
-        QLOG_INFO()<<QString("[<<<<---Sqlite Database:Update OrderId %1 posCheckNo Success--->>>>]").arg(orderId);
+        QLOG_INFO()<<QString("[<<<<---Sqlite Database:Action4: Report CheckNo : Update OrderId:%1 posCheckNo:%2 Success--->>>>]").arg(orderId,posOrderCheckNo);
         result = true;
     }
     db.close();

fmTakeout/floatForm.cpp

@@ -147,21 +147,21 @@ void FloatForm::onStartRemind(int type)
 {
     switch(type)
     {
-    case 0:
+    case REMIND_CONFIRMED_ORDER:
         m_remindWav = QString("%1/wav/msg.wav").arg(QApplication::applicationDirPath());
         // 加上音频的时长
         m_wavPlayInterval = ConfigManger::GetInstance().GetSoundInterval() + VALUE_NEWORDERTIME;
         break;
-    case 1:
+    case REMIND_REQREFUND_ORDER:
         m_remindWav = QString("%1/wav/msg1.wav").arg(QApplication::applicationDirPath());
         m_wavPlayInterval = ConfigManger::GetInstance().GetSoundInterval() + VALUE_REFUNDORDERTIME;
         break;
     }
+
     if(m_bReminding)
     {
         return;
-    }else
-    {
+    } else {
        m_bReminding = true;
     }
     m_remindTimer.start(1000*30);

fmTakeout/mainForm.cpp

@@ -97,7 +97,7 @@ void MainForm::MyShow()
 
     m_resultForm = new QListWidget(this);
     m_resultForm->setObjectName("mainListWdg0");
-    m_resultForm->setFixedSize(400, 200);
+    m_resultForm->setFixedSize(420, 200);
     m_resultForm->move(70, ui->mainFrmSearch->pos().y()-190);
     m_resultForm->hide();
     connect(m_resultForm, &QListWidget::itemClicked, this, &MainForm::onSearchResultItemClicked);

fmTakeout/preDefine.h

@@ -149,6 +149,19 @@
 #define PROPERTY_SHIFTID        "shiftId"       // 班次编号
 #define PROPERTY_SHIFTNAME      "shiftName"     // 班次名称
 
+
+// 悬浮框: 提醒订单的类型
+#define REMIND_NEW_ORDER        2   // 新订单: 目前不存在case
+#define REMIND_CONFIRMED_ORDER  3   // 已确认的订单(制作中): 最多的case
+#define REMIND_SENDOUT_ORDER    4   // 已配送订单:  不应该提示
+#define REMIND_FINISHED_ORDER   5   // 已完成订单:  不应该提示
+#define REMIND_REFUNDED_ORDER   6   // 已退款订单:  最多且重要的case；
+#define REMIND_REQREFUND_ORDER  7   // 请求退单的订单: 目前如果有请求退单；POS会自动发起退单请求，完成退单动作；
+#define REMIND_AGRREFUND_ORDER  30
+#define REMIND_COMPLAINT_ORDER  12   // 客诉单：最多且重要的case；
+
+
+
 // 服务器返回正确值
 #define JSON_STATUSCODE_OK      100
 // 默认拉取订单的间隔时间

fmTakeout/refdishesForm.cpp

@@ -98,6 +98,7 @@ void refDishesForm::_Init()
         ui->refDishesTable->removeRow(i);
     }
     ui->refDishesTable->clear();
+    ui->refDishesTable->clearContents();
     m_dishesMap.clear();
 }