入账去除服务费

fmPlugin/fmPlugin.cpp

- #include "fmPlugin.h"
+#include "fmPlugin.h"
 #include <QtSql/QSqlError>
 #include <QtSql/QSqlQuery>
 #include <QVariant>
@@ -416,14 +416,17 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
                // 该商品实际收到的钱
                float ss_fee = ys_fee*(1-(float)orderObject->dis_shop_fee/orderObject->product_fee);
 
+
+               qDebug() << "ys_fee" << ys_fee << "ss_fee" << ss_fee;
+
                QJsonObject cObj;
                cObj.insert("skuId", cpObj->pid);
                cObj.insert("qty", cpObj->productAmount*ratio);
-               cObj.insert("price", ss_fee/ratio);
+               cObj.insert("price", ss_fee/(cpObj->productAmount*ratio));
                cObj.insert("total", "");
                cObj.insert("freight", "");
                cObj.insert("payAmount", "");
-               cObj.insert("unitPrice", _Penny2Dollar(pObj->price)/ratio);
+               cObj.insert("unitPrice", ys_fee/(cpObj->productAmount*ratio));
                cObj.insert("priceAmount", "");
                cObj.insert("buyAmount", "");
                cObj.insert("businessDiscount", "");
@@ -443,15 +446,15 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
            // 该商品实际收到的钱
            float ss_fee = ys_fee*(1-(float)orderObject->dis_shop_fee/orderObject->product_fee);
 
-
+           qDebug() << "ys_fee" << ys_fee << "ss_fee" << ss_fee;
 
            cObj.insert("skuId", pObj->pid);
            cObj.insert("qty", pObj->productAmount*ratio);
-           cObj.insert("price", ss_fee/ratio);
+           cObj.insert("price", ss_fee/(pObj->productAmount*ratio));
            cObj.insert("total", "");
            cObj.insert("freight", "");
            cObj.insert("payAmount", "");
-           cObj.insert("unitPrice", _Penny2Dollar(pObj->price)/ratio);
+           cObj.insert("unitPrice", ys_fee/(pObj->productAmount*ratio));
            cObj.insert("priceAmount", "");
            cObj.insert("buyAmount", "");
            cObj.insert("businessDiscount", "");
@@ -465,7 +468,8 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject)
 
     QJsonArray pays;
     QJsonObject payObj;
-    payObj.insert("total", _Penny2Dollar(orderObject->total_fee-orderObject->send_fee-orderObject->service_fee-orderObject->dis_shop_fee));
+    // 与毛工确认过不包含平台服务费！！！！！！！！！！！！SB
+    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

@@ -205,6 +205,7 @@ bool FlowControl::_PullOrder()
                         emit changeOrderStatus(orderObject, oldStatus);
                     }
                 }
+
                 if(orderObject->status == 4 || orderObject->status == 5
                         || orderObject->status == 6
                         || orderObject->status == 200)
@@ -233,14 +234,9 @@ bool FlowControl::_PullOrder()
                     }
 
                     QString error;
-                    if(bWrite&&(orderObject->channel.compare("jdwm")))
+                    if(bWrite)
                     {
-                        //FOR TEST
-                        if(orderObject->order_id == "3543791065")
-                        {
-                            orderObject->order_id = "3543791066";
-                        }
-                        //FOR TEST
+
                         if(FmPlugin::GetInstance().DoOrderEntry(orderObject,"","","","",error))
                         {
                             QLOG_INFO() << QString("_PullOrder DoOrderEntry successful") << error;

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-03-17T18:00:57. -->
+<!-- Written by QtCreator 4.0.0, 2017-03-23T11:30:15. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>