confilict fixed

fmPrinter/fmPrinter.cpp

@@ -76,6 +76,7 @@ FmPrinter::FmPrinter()
     QSettings *fmps=new QSettings(iniFmpsPath,QSettings::IniFormat);
     fmps->setIniCodec("GB2312");
     QString printerName = fmps->value("DRIVER/driver").toString();
+    QString printerDllName;         //商米打印机SDK dll特定要求
 
     if(!printerName.compare(QString("中科英泰")))
         printer = ZHONGKEYINGTAI;
@@ -104,8 +105,11 @@ FmPrinter::FmPrinter()
             m_b_load_sucfl=true;
         }
         break;
-    case SHANGMI:
-        m_UAN_lib.setFileName("pos_ad_dll.dll");
+    case SHANGMI:        
+        printerDllName = fmps->value("DRIVER/path", "c:\\iSmartSystem\\pos_ad_dll.dll").toString();
+        qDebug() << printerDllName;
+        m_UAN_lib.setFileName(printerDllName);
+        //m_UAN_lib.setFileName("pos_ad_dll.dll");
         if(m_UAN_lib.load())
         {
            m_printTextWithStyles    = (PrintTextWithStyles*)m_UAN_lib.resolve("PrintTextWithStyles");
@@ -278,10 +282,10 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     QString bPrintImg("1");
     QString bPrintCode("1");
     QString bPrintXXCHC("1");
-    if(pData->status == 20)
+    if(pData->status == 20||pData->status == 3)
     {
         str0 = pData->channelName+"(顾客申请退单)";
-        remark = QString("请马上联系站点沟通顾客，否则取消单将算入门店异常取消单，影响门店排名，站点电话在平台软件订单里面点击更多联系人");
+        remark = QString("此为取消单，请立即和顾客沟通，根据实际情况处理：美团、京东订单立即在对应平台上操作取消或确认饿了么请联系站点说明情况。否则货款在半小时内会无条件退给顾客！");
         strUrl = "NULL";
         strDesc = "NULL";
         bPrintImg = "0";
@@ -291,7 +295,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
     }else if(pData->status == 22)
     {
         str0 = pData->channelName+"(顾客申请部分退单)";
-        remark = QString("请马上联系站点沟通顾客，否则取消单将算入门店异常取消单，影响门店排名，站点电话在平台软件订单里面点击更多联系人");
+        remark = QString("此为取消单，请立即和顾客沟通，根据实际情况处理：美团、京东订单立即在对应平台上操作取消或确认饿了么请联系站点说明情况。否则货款在半小时内会无条件退给顾客！");
         strUrl = "NULL";
         strDesc = "NULL";
         bPrintImg = "0";
@@ -400,20 +404,20 @@ bool FmPrinter::_PrintBodyForShangmiPrinter(OrderObject *pData)
     QString bPrintImg("1");
     QString bPrintCode("1");
     QString bPrintXXCHC("1");
-    if(pData->status == 20)
+    if(pData->status == 20||pData->status == 3)
     {
         str0 = pData->channelName+"(顾客申请退单)";
-        remark = QString("请马上联系站点沟通顾客，否则取消单将算入门店异常取消单，影响门店排名，站点电话在平台软件订单里面点击更多联系人");
+        remark = QString("此为取消单，请立即和顾客沟通，根据实际情况处理：美团、京东订单立即在对应平台上操作取消或确认饿了么请联系站点说明情况。否则货款在半小时内会无条件退给顾客！");
         strUrl = "NULL";
         strDesc = "NULL";
         bPrintImg = "0";
         bPrintCode = "0";
         deliveryStr = "NULL";
         bPrintXXCHC = "0";
-    }else if(pData->status == 21)
+    }else if(pData->status == 22)
     {
         str0 = pData->channelName+"(顾客申请部分退单)";
-        remark = QString("请马上联系站点沟通顾客，否则取消单将算入门店异常取消单，影响门店排名，站点电话在平台软件订单里面点击更多联系人");
+        remark = QString("此为取消单，请立即和顾客沟通，根据实际情况处理：美团、京东订单立即在对应平台上操作取消或确认饿了么请联系站点说明情况。否则货款在半小时内会无条件退给顾客！");
         strUrl = "NULL";
         strDesc = "NULL";
         bPrintImg = "0";
@@ -666,6 +670,10 @@ bool FmPrinter::_fmPrintData(OrderObject* pData)
             m_pPrintHex("\x0A",1);
             m_pPrintText((QString("备注：")+pData->remark).toLocal8Bit().data(),20);
         }
+        if(pData->status == 20||pData->status == 22||pData->status == 3){
+            m_pPrintHex("\x0A",1);
+            m_pPrintText(QString("此为取消单，请立即和顾客沟通，根据实际情况处理：美团、京东订单立即在对应平台上操作取消或确认饿了么请联系站点说明情况。否则货款在半小时内会无条件退给顾客！").toLocal8Bit().data(),20);
+        }
         m_pPrintHex("\x0A",1);
         m_pPrintText("-----------------------------------------------",20);
         m_pPrintHex("\x1B\x61\x1",3);  //居中

fmTakeaway/Control/flowControl.cpp

@@ -143,7 +143,7 @@ bool FlowControl::_PullOrder()
             error = recvJson[JSON_MESSAGE].toString();
             QLOG_ERROR() << QString("pull orders error.[msg->%1]").arg(error);
             emit showAlert(AlertForm::ERROR, QString("获取订单失败![%1]").arg(error));
-
+            QTimer::singleShot(120000, this, &FlowControl::_PullOrder);
         }else
         {
             // 获取门店营业状态
@@ -253,7 +253,7 @@ bool FlowControl::_PullOrder()
                     }
                 }
 
-                if( (orderObject->status==20||orderObject->status==22) && Orderstatus::getInstance().isprinted_20(orderId))
+                if( (orderObject->refund_type!=0 || orderObject->status==3) && !Orderstatus::getInstance().isprinted_20(orderId))
                 {
                     if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), orderObject))
                     {
@@ -750,7 +750,8 @@ bool FlowControl::_CheckCashiers()
 
 QString FlowControl::_GetJsonStr(const QJsonObject &json)
 {
-    return QString(QJsonDocument(json).toJson(QJsonDocument::Compact)).replace("\"","");
+    //return QString(QJsonDocument(json).toJson(QJsonDocument::Compact)).replace("\"","");
+    return QJsonDocument(json).toJson(QJsonDocument::Compact);
 }
 
 bool FlowControl::_RefundOrder(const QString &orderId, const QString &reason)

fmTakeaway/Model/orderObject.h

@@ -62,6 +62,7 @@ public:
     Q_PROPERTY (QStringList dis_desc READ getdis_desc WRITE setdis_desc)
     Q_PROPERTY (QString order_view_id READ getorder_view_id WRITE setorder_view_id)
     Q_PROPERTY (int order_type READ getorder_type WRITE setorder_type)
+    Q_PROPERTY (QVariant refund_type READ getrefund_type WRITE setrefund_type)
 
     QString order_view_id;  //用户看到的订单ＩＤ
     QString address;         //地址
@@ -114,6 +115,7 @@ public:
 
     QList<ProductObject*> refund_products;     // 需要退款的商品
     int refund_total_fee;                   // 退款总金额
+    int refund_type;                        // 退款状态 1部分退款 2全额退款
 
 protected:
     int getorder_type() const;
@@ -203,6 +205,8 @@ protected:
 
     QStringList getdis_desc() const;
     void setdis_desc(const QStringList& v);
+    inline QVariant getrefund_type(){ return refund_type; }
+    inline void setrefund_type(const QVariant& v){ refund_type = v.value<int>(); }
 };
 
 #endif // ORDEROBJECT_H

fmTakeaway/mainForm.cpp

@@ -127,7 +127,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText("1.4.0");
+    ui->mainLabVersion->setText("1.4.3");
     ui->mainLabCashier->setText(UI_CASHIER);
 
     // 初始化表