1：修复入账名称 微店外卖->微信外卖

fmPrinter/fmPrinter.cpp

@@ -75,18 +75,34 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
         //                .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
         //            str_comd_list.append(QString(name+price+"     "));
         //        }
-        if(printsize==56)
+
+
+
+//        if(printsize==56)
+//        {
+//            price = QString("%1    x%2    %3  优惠价 %4").arg(_Penny2Dollar(pData->proList[i]->price)).arg(pData->proList[i]->productAmount)
+//                    .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount)).arg(_Penny2Dollar(ss_fee));
+//            str_comd_list.append(QString(name+"$"+price+"$"));
+//        }
+//        else
+//        {
+        if(!pData->channel.compare("eleme"))
         {
-            price = QString("%1      x%2      %4").arg(_Penny2Dollar(pData->proList[i]->price)).arg(pData->proList[i]->productAmount)
-                    .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
-            str_comd_list.append(QString(name+"$"+price+"$"));
-        }
-        else
+            // 该商品应收的钱
+            float ys_fee = pData->proList[i]->price*pData->proList[i]->productAmount;
+            // 该商品实际收到的钱
+            float ss_fee = ys_fee*(1- ( (float)pData->dis_shop_fee )/pData->product_fee);
+
+            price = QString("%1    x%2    %3  优惠价 %4").arg(_Penny2Dollar(pData->proList[i]->price)).arg(pData->proList[i]->productAmount)
+                    .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount)).arg(_Penny2Dollar(ss_fee));
+        }else
         {
-            price = QString("%1      x%2      %4").arg(_Penny2Dollar(pData->proList[i]->price)).arg(pData->proList[i]->productAmount)
+            price = QString("%1      x%2      %3").arg(_Penny2Dollar(pData->proList[i]->price)).arg(pData->proList[i]->productAmount)
                     .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
-            str_comd_list.append(QString(name+"$"+price+"$"));
         }
+
+        str_comd_list.append(QString(name+"$"+price+"$"));
+//        }
     }
 
     foreach(QString comm, pData->dis_desc)

fmTakeaway/Control/flowControl.cpp

@@ -249,8 +249,8 @@ 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;