Add 1：新增小票满赠商品的显示

fmPrinter/fmPrinter.cpp

@@ -73,6 +73,12 @@ QStringList FmPrinter::_GetPrintData(OrderObject *pData)
         }
     }
 
+    foreach(QString comm, pData->dis_desc)
+    {
+        str_comd_list.append(QString("(赠)"+comm+"\r\n"));
+    }
+
+
 
 //    for(int i=0; i<pData->proList.count(); i++)
 //    {

fmTakeaway/Model/orderObject.cpp

@@ -20,6 +20,16 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+QStringList OrderObject::getdis_desc() const
+{
+    return dis_desc;
+}
+
+void OrderObject::setdis_desc(const QStringList &v)
+{
+    dis_desc = v;
+}
+
 int OrderObject::getorder_type() const
 {
     return order_type;

fmTakeaway/Model/orderObject.h

@@ -61,6 +61,7 @@ public:
     Q_PROPERTY (int order_type READ getorder_type WRITE setorder_type)
     Q_PROPERTY (QString delivery_code READ getdelivery_code WRITE setdelivery_code)
     Q_PROPERTY (QString meal_num READ getmeal_num WRITE setmeal_num)
+    Q_PROPERTY (QStringList dis_desc READ getdis_desc WRITE setdis_desc)
 
 
     int service_fee;         //平台佣金
@@ -111,8 +112,14 @@ public:
 
     QPushButton* curt_table_btn; //当前订单所在表对应的按钮
 
+    QStringList dis_desc;        //赠送商品信息
+
 
 protected:
+
+    QStringList getdis_desc() const;
+    void setdis_desc(const QStringList& v);
+
     int getorder_type() const;
     void setorder_type(const int& v);
     QString getdelivery_code() const;

fmTakeaway/mainForm.cpp

@@ -114,7 +114,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText(APP_VERSION);
+    ui->mainLabVersion->setText("1.0.5");
 
     // 初始化表
     int scales6[] = {3, 4, 2, 3, 3, 3};