小票信息新增，赠品信息

fmPrinter/fmPrinter.cpp

@@ -89,6 +89,11 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
         }
     }
 
+    foreach(QString comm, pData->dis_desc)
+    {
+        str_comd_list.append(QString("(赠)"+comm+"$"));
+    }
+
     QStringList cfgList;
     cfgList = pData->printcfg.split('|');
     //    foreach (QString v, cfgList) {

fmTakeaway/Model/orderObject.cpp

@@ -405,3 +405,13 @@ void OrderObject::setrecords(const QStringList &v)
 {
     records = v;
 }
+
+QStringList OrderObject::getdis_desc() const
+{
+    return dis_desc;
+}
+
+void OrderObject::setdis_desc(const QStringList &v)
+{
+    dis_desc = v;
+}

fmTakeaway/Model/orderObject.h

@@ -59,6 +59,7 @@ public:
     Q_PROPERTY (int delivery_type READ getdelivery_type WRITE setdelivery_type)
     Q_PROPERTY (QString fm_id READ getfm_id WRITE setfm_id)
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
+    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)
 
     QString order_view_id;  //用户看到的订单ＩＤ
@@ -99,6 +100,7 @@ public:
     int total_amount;        //总件数
     int user_fee;            //应付金额
     QStringList records;         //订单操作记录
+    QStringList dis_desc;        //赠送商品信息
     int service_fee;             //平台服务费
     int dis_shop_fee;       //商户承担的优惠金额
     int product_fee;        //商品金额+打包费
@@ -189,6 +191,9 @@ protected:
     void setdis_shop_fee(const int& v);
     QStringList getrecords() const;
     void setrecords(const QStringList& v);
+
+    QStringList getdis_desc() const;
+    void setdis_desc(const QStringList& v);
 };
 
 #endif // ORDEROBJECT_H

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-03-28T18:27:02. -->
+<!-- Written by QtCreator 4.0.0, 2017-04-10T18:15:59. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>