Fix 1: 更改入帐逻辑为服务器错误则订单移除队列

      2: 修复合并商品SKU丢失的问题

fmPlugin/fmPlugin.cpp

@@ -138,7 +138,7 @@ bool FmPlugin::GetOnDutyCashiers(QList<CashierObject> &cashiersList, QString &er
     return true;
 }
 
-bool FmPlugin::DoOrderEntry(const OrderObject *orderObject, const QString &cashierId, const QString &cashierName, QString &bill_data, QString &fee_data, QString &error)
+bool FmPlugin::DoOrderEntry(const OrderObject *orderObject, const QString &cashierId, const QString &cashierName, QString &bill_data, QString &fee_data, QString &error, bool& bServerFailed)
 {
     Q_UNUSED(cashierId)Q_UNUSED(cashierName)
 
@@ -196,6 +196,7 @@ bool FmPlugin::DoOrderEntry(const OrderObject *orderObject, const QString &cashi
         if(uuid.isEmpty())
         {
             error = recvJson["echoMessage"].toString();
+            bServerFailed = true;
             return false;
         }
         recvArray.clear();
@@ -475,6 +476,7 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject, const QS
     QJsonArray products;
     for(int i=0; i < orderObject->proList.count(); i++)
     {
+        qDebug() <<orderObject->order_id << i;
        ProductObject *pObj = orderObject->proList.at(i);
        if(!pObj->sub_products.isEmpty())
        {
@@ -489,6 +491,7 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject, const QS
                if(_proMap.contains(cpObj->pid))
                {
                    Product_elemet elemet;
+                   elemet.skuId = cpObj->pid;
                    elemet.qty =  _proMap.value(cpObj->pid).qty + cpObj->productAmount*ratio;
                    elemet.ys_fee = _proMap.value(cpObj->pid).ys_fee + ys_fee;
                    elemet.ss_fee = _proMap.value(cpObj->pid).ss_fee + ss_fee;
@@ -518,6 +521,7 @@ QByteArray FmPlugin::_GetOrderEntryData(const OrderObject *orderObject, const QS
            if(_proMap.contains(pObj->pid))
            {
                Product_elemet elemet;
+               elemet.skuId = pObj->pid;
                elemet.qty =  _proMap.value(pObj->pid).qty + pObj->productAmount*ratio;
                elemet.ys_fee = _proMap.value(pObj->pid).ys_fee + ys_fee;
                elemet.ss_fee = _proMap.value(pObj->pid).ss_fee + ss_fee;

fmPlugin/fmPlugin.h

@@ -48,7 +48,7 @@ public slots:
      * 返回:是否成功
      * */
     bool DoOrderEntry(OrderObject const *orderObject, const QString& cashierId, const QString& cashierName,
-                      QString& bill_data, QString& fee_data, QString& error);
+                      QString& bill_data, QString& fee_data, QString& error, bool& bServerFailed);
 
     /* 功能:获取库存信息
      * 参数:[1]_out库存信息