1:修复组合商品的成本价问题

fmPlugin/fmPlugin.cpp

@@ -403,7 +403,8 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
                cObj.insert("platformDiscount", "");
                cObj.insert("businessDiscountInfo", "");
                cObj.insert("platformDiscountInfo", "");
-               cObj.insert("note", QString::number(_Penny2Dollar(pObj->productAmount*ratio*pObj->cost),'f',2));
+
+               cObj.insert("note", QString::number(_Penny2Dollar(cpObj->productAmount*ratio*cpObj->cost),'f',2));
                products.insert(i, cObj);
            }
        }else
@@ -439,13 +440,8 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
     QJsonArray pays;
     QJsonObject payObj;
     // 与毛工确认过不包含平台服务费！！！！！！！！！！！！
-    // 与王蒙确认自配送的订单配送费算门店收入，其他不算
-    int send_fee = 0;
-    if(orderObject->delivery_type==1)
-    {
-        send_fee = orderObject->send_fee;
-    }
-    payObj.insert("total", _Penny2Dollar(orderObject->total_fee-send_fee-orderObject->dis_shop_fee));
+    // 与王蒙确认自配送的订单配送费算门店收入不在订单总额体现，海鼎会另外开接口
+    payObj.insert("total", _Penny2Dollar(orderObject->total_fee-orderObject->send_fee-orderObject->dis_shop_fee));
     payObj.insert("payName", "非码外卖");
     pays.insert(0, payObj);
 

fmTakeaway/Control/flowControl.cpp

@@ -246,12 +246,11 @@ 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*20, [orderObject,this](){
+                        //QTimer::singleShot(1000*60*120, [orderObject, this](){
+                        QTimer::singleShot(1000*20, [orderObject,this](){
                             if(orderObject->status == 6 || orderObject->status == 200)
                             {
                                 QString error;

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-05-09T11:54:00. -->
+<!-- Written by QtCreator 4.0.0, 2017-05-11T15:06:55. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -184,7 +184,7 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">fmTakeaway/fmTakeaway.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/Users/Alan/Work/Build/takeaway-Release/XianFeng</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>