改变订单详情页的加料信息展示，flowcontrol做些优化

fmTakeaway/Control/flowControl.cpp

@@ -282,7 +282,7 @@ bool FlowControl::_PullOrder()
                                    ConfigManger::GetInstance().GetInterfaceName(INI_INTERFACE_PULLORDER)));
     result = m_pullOrderSocket->Request(sendJson, recvJson, error);
     QLOG_INFO() << QString("pull order finsh. [result:%1][msg:%2]")
-                   .arg(result).arg(error);
+                   .arg(result).arg(error)<<recvJson;
     if(!result)
     {
         emit setNetStatus("<font color='#ff0000'>异常</font>");
@@ -1009,6 +1009,8 @@ bool FlowControl::_GetReplyJson(const QJsonObject &content,QJsonObject &data, QS
             result=_Get12ReplyJson(content,data,error);
             break;
         default:
+            error =QString("未知的请求");
+            result = false;
             break;
         }
     }
@@ -1018,7 +1020,7 @@ bool FlowControl::_GetReplyJson(const QJsonObject &content,QJsonObject &data, QS
 bool FlowControl::_Get01ReplyJson(const QJsonObject &content, QJsonObject &data, QString &error)
 {
     QLOG_INFO()<<__FUNCTION__;
-    int result;
+    bool result=true;
     if(!m_bLoginResult&&content.contains("storeId"))
     {
         result=_GetLoginReplyJson(content,error);
@@ -1027,27 +1029,22 @@ bool FlowControl::_Get01ReplyJson(const QJsonObject &content, QJsonObject &data,
         result=_GetQueryReplyJson(data,error,content["orderId"].toString());
     }
     else{
-        error = QString("请求参数错误");
+        result = false;
+        if(error.isEmpty())
+        {
+            error=QString("请求参数错误");
+        }
     }
     return result;
 }
 bool FlowControl::_Get02ReplyJson(const QJsonObject &content, QJsonObject &data, QString &error)
 {
     QLOG_INFO()<<__FUNCTION__;
-    int result;
+    bool result = true;
     if(m_bLoginResult&&content.contains("orderId")){
         QString orderId=content["orderId"].toString();
         if(m_ordersMap.contains(orderId))
         {
-//            if(m_orderOperatePair.contains(orderId))
-//            {
-//                if(orderOperation.orderId==orderId)
-//                {
-//                    emit showAlert(AlertForm::MSGERROR,"订单已经在收银机上操作，请等待结果");
-//                    error=QString("订单已经在收银机上操作，请等待结果");
-//                }
-//                return false;
-//            }
             emit doStartOperateTimer();
             emit doConfirmOrder(orderId);
             orderOperation.orderId=orderId;
@@ -1078,20 +1075,11 @@ bool FlowControl::_Get02ReplyJson(const QJsonObject &content, QJsonObject &data,
 bool FlowControl::_Get03ReplyJson(const QJsonObject &content, QJsonObject &data, QString &error)
 {
     QLOG_INFO()<<__FUNCTION__;
-    int result;
+    bool result = true;
     if(m_bLoginResult&&content.contains("orderId")){
         QString orderId=content["orderId"].toString();
         if(m_ordersMap.contains(orderId))
         {
-//            if(m_orderOperatePair.contains(orderId))
-//            {
-//                if(orderOperation.orderId==orderId)
-//                {
-//                    emit showAlert(AlertForm::SUCCESS,"订单已经在收银机上操作，请等待结果");
-//                    error=QString("订单已经在收银机上操作，请等待结果");
-//                }
-//                return false;
-//            }
             emit doStartOperateTimer();
             emit doRefundOrder(orderId,-1,QString("同意退款"));
             orderOperation.orderId=orderId;
@@ -1126,10 +1114,10 @@ bool FlowControl::_Get04ReplyJson(const QJsonObject &content, QJsonObject &data,
     bool result=true;
     if(m_bLoginResult&&content.contains("orderId")){
         QString orderId=content["orderId"].toString();
-        QString posSaleId=content["PosSaleId"].toString();
-        if(orderId.isEmpty())
+        QString posSaleId=content["posSaleId"].toString();
+        if(posSaleId.isEmpty())
         {
-            orderId=m_orderIdToPosSalesIdMap.key(posSaleId);
+            posSaleId=m_orderIdToPosSalesIdMap.value(orderId);
         }
         if(!posSaleId.isEmpty()&&!orderId.isEmpty())
         {
@@ -1155,8 +1143,8 @@ bool FlowControl::_Get04ReplyJson(const QJsonObject &content, QJsonObject &data,
             }
             else{
                 OrderProperpy op;
-                op.bCancled = true;
-                op.bReaded = false;
+                op.bCancled = false;
+                op.bReaded = true;
                 op.entryType = 0;
                 op.pullNum=0;
                 m_OrderEntryMutex.lock();
@@ -1275,7 +1263,7 @@ bool FlowControl::_GetQueryReplyJson(QJsonObject &data, QString &error, const QS
         rObj.insert("fm_ver", "1.0");
         cObj.insert("pay_id", "002");
         cObj.insert("pay_str", "非码外卖");
-        cObj.insert("posSales_id", orderObject->possale_id);
+        cObj.insert("pos_sale_id", orderObject->possale_id);
         cObj.insert("order_status",orderObject->status);//订单的状态
         cObj.insert("pay_ebcode", orderObject->channel);
         cObj.insert("order_index", orderObject->order_index);

fmTakeaway/detailForm.cpp

-#include "detailForm.h"
+#include "detailForm.h"
 #include "ui_detailForm.h"
 #include "DTools/util.h"
 #include "preDefine.h"
@@ -112,20 +112,22 @@ void DetailForm::_Init()
 QString DetailForm::GetProductName(DishObject* dish)
 {
     QString name;
-    name.append(dish->name).append(QString("(%1)").arg(dish->property_tags));
+    QString propertyTags;
+    name.append(dish->name).append("\r\n");
+    propertyTags=dish->property_tags;
+    if(!propertyTags.isEmpty())
+    {
+        name.append(QString("(%1)").arg(propertyTags));
+    }
+
     if(!dish->sub_products.isEmpty())
     {
         foreach(auto value,dish->sub_products)
         {
-            name.append(value->name);
+            name.append(value->name).append("|");
         }
-
-//        for(int j=0; j < dish->sub_products.count(); j++)
-//        {
-//            DishObject* subDish=dish->sub_products.at(j);
-//            name.append(subDish->name);
-//        }
     }
+    name.remove((name.length()-1),1);
     return name;
 }