1：修复入账服务费数值误传问题

fmPlugin/fmPlugin.cpp

@@ -354,10 +354,10 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
     QString serviceFee;
     if(orderObject->channel=="jdwm")
     {
-        serviceFee = _Penny2Dollar((orderObject->product_fee-orderObject->dis_shop_fee)*0.08);
+        serviceFee = QString::number(_Penny2Dollar((orderObject->product_fee-orderObject->dis_shop_fee)*0.08),'f',2);
     }else
     {
-        serviceFee = _Penny2Dollar(orderObject->service_fee);
+        serviceFee = QString::number(_Penny2Dollar(orderObject->service_fee),'f',2);
     }
 
     rObj.insert("senderCode", m_storeId);

fmTakeaway/Control/flowControl.cpp

@@ -260,6 +260,8 @@ bool FlowControl::_PullOrder()
                     {
                         QLOG_INFO() << QString("will entry %1").arg(orderObject->order_id);
                         QTimer::singleShot(1000*60*120, [orderObject](){
+                            if(orderObject->status == 6 || orderObject->status == 200)
+                            {
                                 QString error;
                                 if(FmPlugin::GetInstance().DoOrderEntry(orderObject,"","","","",error))
                                 {
@@ -268,7 +270,12 @@ bool FlowControl::_PullOrder()
                                 {
                                     QLOG_INFO() << QString("_PullOrder DoOrderEntry failed %1 %2").arg(orderObject->order_id, error);
                                 }
+                            }else
+                            {
+                                QLOG_INFO() << QString("cancle entry %1").arg(orderObject->order_id);
+                            }
                         });
+
                     }else
                     {
                         QLOG_INFO() << QString("销售单数据有误 %1").arg(orderObject->order_id);

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-04-21T16:05:36. -->
+<!-- Written by QtCreator 4.0.0, 2017-04-26T10:13:09. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>