Fix 1:修复费用单平台名称问题。

fmPlugin/fmPlugin.cpp

@@ -551,11 +551,11 @@ QByteArray FmPlugin::_GetFeeData(const OrderObject *orderObject, QString uuid)
 
 
     QJsonObject rObj;
-    rObj.insert("num",orderObject->order_view_id);
+    rObj.insert("num",orderObject->order_view_id.isEmpty()?orderObject->order_id:orderObject->order_view_id);
     rObj.insert("cls","外卖费用");
-    rObj.insert("busType","美团外卖");
-    rObj.insert("platform","美团外卖");
-    rObj.insert("filDate",QDateTime::fromTime_t(orderObject->create_time).toString("yyyy-MM-ddThh:mm:ss.zzz+0800"));
+    rObj.insert("busType",orderObject->channelName);
+    rObj.insert("platform",orderObject->channelName);
+    rObj.insert("filDate",QDateTime::currentDateTime().toString("yyyy-MM-ddThh:mm:ss.zzz+0800"));
     rObj.insert("filler","非码外卖");
     rObj.insert("note","");
     rObj.insert("total", serviceFee+sendFee);

fmTakeaway/Control/flowControl.cpp

@@ -251,7 +251,7 @@ bool FlowControl::_PullOrder()
                     if(bWrite)
                     {
                         QLOG_INFO() << QString("will entry %1").arg(orderObject->order_id);
-                        QTimer::singleShot(1000*60*120, [orderObject, this](){
+                        QTimer::singleShot(1000*60*60, [orderObject, this](){
                         //QTimer::singleShot(1000*10, [orderObject,this](){
 
                               QLOG_INFO() << QString("订单[%1]进入队列").arg(orderObject->order_id);
@@ -316,6 +316,10 @@ void FlowControl::_PostBill()
     }else
     {
        QLOG_INFO() << QString("cancle entry %1").arg(orderObject->order_id);
+       m_mutex.lock();
+       m_billList.removeOne(orderObject);
+       QLOG_INFO() << QString("订单%1移出队列").arg(orderObject->order_id);
+       m_mutex.unlock();
     }
 
     QTimer::singleShot(10000, this, &FlowControl::_PostBill);