fix bug: 新增 OrderOriginType 和 OrderPayTape 数据传递到 Simpyhony

fmTakeout/Model/dishesObject.h

@@ -15,6 +15,7 @@ class dishesObject : public QObject
     Q_PROPERTY (int packagePrice READ getpackagePrice WRITE setpackagePrice)
     Q_PROPERTY (int qty READ getqty WRITE setqty)
     Q_PROPERTY (int price READ getprice WRITE setprice)
+    Q_PROPERTY (QString options READ getoptions WRITE setoptions)
 
 public:
     explicit dishesObject(QObject *parent = 0):QObject(parent){}
@@ -29,6 +30,7 @@ public:
     int qty;
     int packagePrice;
     int price;
+    QString options;
     QList<dishesObject*> sub_products;
 
 protected:
@@ -44,6 +46,9 @@ protected:
     inline int getprice(){ return price; }
     inline void setprice(const int& v){ price = v; }
 
+    inline QString getoptions(){ return options; }
+    inline void setoptions(const QString& v){ options = v; }
+
     inline int getpackagePrice(){ return packagePrice; }
     inline void setpackagePrice(const int& v){ packagePrice = v; }
 

fmTakeout/Model/orderObject.cpp

@@ -72,8 +72,8 @@ QString OrderObject::getChannelName()
     switch(value)
     {
         case 1:return QString::fromLocal8Bit("星巴克");
-        case 2:return QString::fromLocal8Bit("百度外卖");
-        case 3:return QString::fromLocal8Bit("饿了么");
+        case 2:return QString::fromLocal8Bit("饿了么");
+        case 3:return QString::fromLocal8Bit("客诉单"); //百度外卖
         deafult: return QString::fromLocal8Bit("未知");
     }
     return QString::fromLocal8Bit("未知");

fmTakeout/Model/orderObject.h

@@ -11,6 +11,7 @@ class OrderObject : public QObject
 
 
     Q_PROPERTY (QString id READ getId WRITE setId)
+    Q_PROPERTY (int orderType READ getOrderType WRITE setOrderType)
     Q_PROPERTY (QString orgOrderId READ getOrgOrderId WRITE setOrgOrderId)
     Q_PROPERTY (QString waybillId READ getWaybillId WRITE setWaybillId)
     Q_PROPERTY (QString watercourseId READ getWatercourseId WRITE setWatercourseId)
@@ -84,6 +85,7 @@ public:
 
 
     QString id;  //编号
+    int orderType; //订单类型: 用来区分是 正常订单(1) 预订单(2) 还是 客诉单:3 (星巴克定义客诉单的类型:12);
     QString orgOrderId; //原始订单编号
     QString waybillId;  //运单号
     QString watercourseId; //流水号
@@ -96,7 +98,7 @@ public:
     QString storeId;
     QString storeName;
     QString storeAddress;
-    QString channel;
+    QString channel;   //订单渠道: 1 星巴克APP 2饿了么APP 3 客诉单;
     QString payWay;
     QString deliveryTime; //配送时间
     QString riderName; //骑手名
@@ -142,6 +144,9 @@ public:
     inline QString getId()const{return id;}
     inline void setId(const QString& v){id = v;}
 
+    inline int getOrderType()const{return orderType;}
+    inline void setOrderType(const int& v){orderType = v;}
+
     inline QString getOrgOrderId()const{return orgOrderId;}
     inline void setOrgOrderId(const QString& v){orgOrderId = v;}
 

fmTakeout/detailForm.cpp

@@ -143,6 +143,7 @@ void DetailForm::onOperaBtnClicked()
         //    }
         //    else if(pBtn->text()=="退单")
         //    {
+        m_refuseForm->SetOrderInfo(m_orderObject);
         m_refuseForm->show();
         if(m_refuseForm->exec()==QDialog::Accepted)
         {

fmTakeout/refuseForm.cpp

@@ -58,7 +58,8 @@ void RefuseForm::on_reason2_toggled(bool checked)
         if(QDialog::Accepted == m_refDishesForm->exec())
         {
             ui->refuseBtnOk->setEnabled(true);
-            m_reasonCode="菜品已售完";
+            //m_reasonCode=
+            m_reasonStr=QString::fromLocal8Bit("菜品已售完");
             on_refuseBtnOk_clicked();
         }else
         {