1:修改配送费入账暂时不同步到门店

fmPlugin/fmPlugin.cpp

@@ -439,7 +439,13 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
     QJsonArray pays;
     QJsonObject payObj;
     // 与毛工确认过不包含平台服务费！！！！！！！！！！！！
-    payObj.insert("total", _Penny2Dollar(orderObject->total_fee-orderObject->send_fee-orderObject->dis_shop_fee));
+    // 与王蒙确认自配送的订单配送费算门店收入，其他不算
+    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("payName", "非码外卖");
     pays.insert(0, payObj);
 

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-05-06T00:16:28. -->
+<!-- Written by QtCreator 4.0.0, 2017-05-09T11:54:00. -->
 <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">C:/Users/Alan/Work/Build/takeaway-Release/XianFeng</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></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>