新增堂食单 自提单

fmTakeaway/Control/flowControl.cpp

@@ -147,6 +147,7 @@ bool FlowControl::_PullOrder()
                     //新数据
                     orderObject = new OrderObject(this);
                     orderObject->FromJson(jsonObject);
+
                     m_ordersMap.insert(orderObject->order_id, orderObject);
                     QLOG_INFO() << QString("new order[%1:%2].[data:%3]")
                                    .arg(orderObject->order_id, orderObject->status_desc)
@@ -198,7 +199,7 @@ bool FlowControl::_PullOrder()
                         }
                     }
 
-                    if(oldStatus != orderObject->status)
+                    if(oldStatus != orderObject->status && orderObject->order_type!=4 && orderObject->order_type!=3)
                     {
                        emit changeOrderStatus(orderObject, oldStatus, bRed);
                     }
@@ -505,6 +506,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,QString reason)
     QJsonObject sendJson;
     QJsonObject recvJson;
 
+
+
     sendJson = DataManger::GetInstance().GetRefundOrderData(reason,orderId);
 
     emit showAlert(AlertForm::LOADING, "正在通信......");

fmTakeaway/Model/orderObject.cpp

@@ -19,6 +19,36 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+int OrderObject::getorder_type() const
+{
+    return order_type;
+}
+
+void OrderObject::setorder_type(const int &v)
+{
+    order_type = v;
+}
+
+QString OrderObject::getdelivery_code() const
+{
+    return delivery_code;
+}
+
+void OrderObject::setdelivery_code(const QString &v)
+{
+    delivery_code = v;
+}
+
+QString OrderObject::getmeal_num() const
+{
+    return meal_num;
+}
+
+void OrderObject::setmeal_num(const QString &v)
+{
+    meal_num = v;
+}
+
 int OrderObject::getservice_fee() const
 {
     return service_fee;

fmTakeaway/Model/orderObject.h

@@ -56,6 +56,9 @@ public:
     Q_PROPERTY (int dis_platform_fee READ getdis_platform_fee WRITE setdis_platform_fee)
     Q_PROPERTY (int dis_shop_fee READ getdis_shop_fee WRITE setdis_shop_fee)
     Q_PROPERTY (int package_fee READ getpackage_fee WRITE setpackage_fee)
+    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)
 
 
     int service_fee;         //平台佣金
@@ -82,6 +85,7 @@ public:
     QString invoice_title;   //发票抬头
     QString order_id;        //订单号
     int order_index;         //渠道当天序号
+    int order_type;          //订单类型
     QString pay_type;        //支付方式
     QString phone;           //电话
     QString posorder_id;     //pos订单号
@@ -100,9 +104,19 @@ public:
     int user_fee;            //应付金额
     QStringList records;         //订单操作记录
 
+    QString delivery_code;     // 提货码
+    QString meal_num;          // 堂食桌号
+
 
 
 protected:
+    int getorder_type() const;
+    void setorder_type(const int& v);
+    QString getdelivery_code() const;
+    void setdelivery_code(const QString& v);
+    QString getmeal_num() const;
+    void setmeal_num(const QString& v);
+
     int getservice_fee() const ;
     void setservice_fee(const int& v);
     int getdis_platform_fee() const ;

fmTakeaway/Model/productObject.cpp

@@ -9,6 +9,16 @@ void ProductObject::setPid(const QString &v)
     pid = v;
 }
 
+QString ProductObject::getbsk_num() const
+{
+    return bsk_num;
+}
+
+void ProductObject::setbsk_num(const QString &v)
+{
+    bsk_num = v;
+}
+
 QString ProductObject::getName() const
 {
     return name;

fmTakeaway/Model/productObject.h

@@ -15,17 +15,23 @@ public:
     Q_PROPERTY (QString upc READ getupc WRITE setupc)
     Q_PROPERTY (int price READ getprice WRITE setprice)
     Q_PROPERTY (int productAmount READ getProductAmount WRITE setProductAmount)
+    Q_PROPERTY(QString bsk_num READ getbsk_num WRITE setbsk_num)
 
     QString pid;
     QString name;
     QString upc;
     int price;
     int productAmount;
+    QString bsk_num;
+
 
 protected:
     QString getPid() const ;
     void setPid(const QString& v);
 
+    QString getbsk_num() const;
+    void setbsk_num(const QString& v);
+
     QString getName() const ;
     void setName(const QString& v);
 

fmTakeaway/detailForm.cpp

@@ -29,8 +29,7 @@ void DetailForm::InitData(OrderObject *orderObject)
 {
     m_orderObject = orderObject;
     // 恢复界面
-    ui->detailTable0->clearContents();
-    ui->detailTable0->setRowCount(0);
+    ui->detailTable0->clear();
     ui->detailBtn2->show();
     ui->detailBtn3->show();
 
@@ -46,21 +45,45 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab4->setText(QString("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party,
                                                                  Penny2Dollar(orderObject->send_fee)));
     ui->detailLab5->setText(orderObject->delivery_time==0? "立即送出" : QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm"));
+
     ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? "暂未指定" : QString("[姓名]%1 [电话]%2")
                                                                             .arg(orderObject->courier_name, orderObject->courier_phone));
     ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));
     ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票");
+    if(orderObject->order_type==3 || orderObject->order_type==4)
+    {
+        ui->detailSlab8->setText("提货码");
+        ui->detailLab8->setText(orderObject->delivery_code);
+    }
 
+    QString topName = "";
+    QTreeWidgetItem* topItem = NULL;
     for(int i=0; i<orderObject->proList.count(); i++)
     {
-        ui->detailTable0->insertRow(i);
-        ui->detailTable0->setItem(i, 0, new QTableWidgetItem(orderObject->proList.at(i)->name));  // 商品名
-        ui->detailTable0->item(i, 0)->setTextAlignment(Qt::AlignCenter);
-        ui->detailTable0->setItem(i, 1, new QTableWidgetItem(Penny2Dollar(orderObject->proList.at(i)->price)));  // 价格
-        ui->detailTable0->item(i, 1)->setTextAlignment(Qt::AlignCenter);
-        ui->detailTable0->setItem(i, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->productAmount)));  // 数量
-        ui->detailTable0->item(i, 2)->setTextAlignment(Qt::AlignCenter);
+        if(orderObject->proList.at(i)->bsk_num.isEmpty())
+        {
+            orderObject->proList.at(i)->bsk_num = "1";
+        }
+        if(topName.compare(orderObject->proList.at(i)->bsk_num))
+        {
+            if(topItem!=NULL)
+            {
+                topItem->setExpanded(true);
+            }
+            topName = orderObject->proList.at(i)->bsk_num;
+            topItem = new QTreeWidgetItem(QStringList()<<QString("%1号口袋").arg(topName));
+
+            ui->detailTable0->addTopLevelItem(topItem);
+        }
+        QTreeWidgetItem *cItem = new QTreeWidgetItem(QStringList()<< orderObject->proList.at(i)->name
+                                                    << Penny2Dollar(orderObject->proList.at(i)->price)
+                                                    << QString::number(orderObject->proList.at(i)->productAmount));
+        cItem->setTextAlignment(0, Qt::AlignCenter);
+        cItem->setTextAlignment(1, Qt::AlignCenter);
+        cItem->setTextAlignment(2, Qt::AlignCenter);
+        topItem->addChild(cItem);
     }
+    topItem->setExpanded(true);
 
     QString records;
     foreach(QString record, orderObject->records)
@@ -91,6 +114,12 @@ void DetailForm::InitData(OrderObject *orderObject)
         ui->detailBtn3->hide();
     }
     m_rejectForm = new RejectForm(this);
+
+    if(orderObject->order_type==3 || orderObject->order_type==4)
+    {
+        ui->detailBtn2->hide();
+        ui->detailBtn3->hide();
+    }
 }
 
 void DetailForm::_Init()
@@ -102,8 +131,12 @@ void DetailForm::_Init()
     ui->detailTable0->setColumnWidth(0, tableWidth*5/9);
     ui->detailTable0->setColumnWidth(1, tableWidth*2/9);
     ui->detailTable0->setColumnWidth(2, tableWidth*2/9);
-    ui->detailTable0->horizontalHeader()->setFixedHeight(25);
-    ui->detailTable0->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
+    ui->detailTable0->header()->setDefaultAlignment(Qt::AlignCenter);
+    ui->detailTable0->header()->setFixedHeight(25);
+    ui->detailTable0->header()->setStretchLastSection(true);
+    ui->detailTable0->header()->setSectionResizeMode(QHeaderView::Fixed);
+
+//    ui->detailTable0->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
 }
 
 void DetailForm::onOperaBtnClicked()

fmTakeaway/detailForm.ui

@@ -139,7 +139,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QTableWidget" name="detailTable0">
+        <widget class="QTreeWidget" name="detailTable0">
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -167,20 +167,14 @@
          <property name="selectionBehavior">
           <enum>QAbstractItemView::SelectRows</enum>
          </property>
-         <property name="showGrid">
-          <bool>false</bool>
+         <property name="indentation">
+          <number>20</number>
          </property>
-         <attribute name="horizontalHeaderCascadingSectionResizes">
+         <attribute name="headerVisible">
           <bool>true</bool>
          </attribute>
-         <attribute name="horizontalHeaderStretchLastSection">
-          <bool>true</bool>
-         </attribute>
-         <attribute name="verticalHeaderVisible">
-          <bool>false</bool>
-         </attribute>
-         <attribute name="verticalHeaderDefaultSectionSize">
-          <number>35</number>
+         <attribute name="headerMinimumSectionSize">
+          <number>40</number>
          </attribute>
          <column>
           <property name="text">
@@ -189,7 +183,7 @@
          </column>
          <column>
           <property name="text">
-           <string>价格</string>
+           <string>单价</string>
           </property>
          </column>
          <column>
@@ -271,7 +265,7 @@
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,1,1,1,1,1,1,1,1,1,0">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -820,6 +814,19 @@
         </layout>
        </item>
        <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
         <layout class="QHBoxLayout" name="horizontalLayout_13">
          <property name="spacing">
           <number>6</number>

fmTakeaway/mainForm.cpp

@@ -22,6 +22,8 @@ MainForm::MainForm(QWidget *parent) :
     // 初始化成员变量
     m_prevBtn = NULL;
     m_prevTable = NULL;
+    m_tableList.append(ui->mainTableTSD);
+    m_tableList.append(ui->mainTableZTD);
     m_tableList.append(ui->mainTableNew);
     m_tableList.append(ui->mainTableMake);
     m_tableList.append(ui->mainTableSend);
@@ -102,7 +104,7 @@ void MainForm::MyShow()
 void MainForm::_Init()
 {
     this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-    this->showFullScreen();
+    //this->showFullScreen();
     // 显示托盘
     m_tray.show();
 
@@ -298,24 +300,38 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool
     _SetTablesSortEnable(false);
     QTableWidget *table;
     QPushButton *tabBtn;
-    // 非首次收到的订单需要现在原先表中删除
-    if(oldStatus != -100)
+    if(orderObject->order_type!=3 && orderObject->order_type!=4)
     {
-        tabBtn = _GetTabBtnByOrderStatus(oldStatus);
-        table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
-        for(int i=0; i<table->rowCount(); i++)
+        // 非首次收到的订单需要现在原先表中删除
+        if(oldStatus != -100)
         {
-            if(!table->item(i, 1)->text().compare(orderObject->order_id))
+            tabBtn = _GetTabBtnByOrderStatus(oldStatus);
+            table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
+            for(int i=0; i<table->rowCount(); i++)
             {
-                table->removeRow(i);
-                QString btnText(tabBtn->property("name").toString());
-                btnText = QString("%1\n%2").arg(table->rowCount()).arg(btnText);
-                tabBtn->setText(btnText);
+                if(!table->item(i, 1)->text().compare(orderObject->order_id))
+                {
+                    table->removeRow(i);
+                    QString btnText(tabBtn->property("name").toString());
+                    btnText = QString("%1\n%2").arg(table->rowCount()).arg(btnText);
+                    tabBtn->setText(btnText);
+                }
             }
         }
     }
+
+
     // 将数据插入到表中
-    tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
+    if(orderObject->order_type==3)
+    {
+        tabBtn = ui->mainBtnZTD;
+    }else if(orderObject->order_type==4)
+    {
+        tabBtn = ui->mainBtnTSD;
+    }else
+    {
+        tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
+    }
     table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
     table->insertRow(0);
     QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1#%2").arg(orderObject->channelName).arg(orderObject->order_index));
@@ -345,7 +361,13 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool
         item4->setTextColor(QColor("red"));
         item5->setTextColor(QColor("red"));
     }
-    if(table != ui->mainTableFinsh && table != ui->mainTableOther)
+
+    if(orderObject->order_type==3 || orderObject->order_type==4)
+    {
+        QTableWidgetItem *item6 = new QTableWidgetItem(orderObject->delivery_code);
+        item6->setTextAlignment(Qt::AlignCenter);
+        table->setItem(0, 6, item6);  // 提货券
+    }else if(table != ui->mainTableFinsh && table != ui->mainTableOther)
     {
         QWidget *pWdg = new QWidget(table);
         QHBoxLayout *hLayout = new QHBoxLayout(pWdg);

fmTestClient/fmTestClient.pro

@@ -6,6 +6,8 @@
 
 QT       += core gui network
 
+CONFIG += c++11
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = fmTestClient

fmTestClient/mainForm.cpp

@@ -8,6 +8,11 @@ MainForm::MainForm(QWidget *parent) :
     ui(new Ui::MainForm)
 {
     ui->setupUi(this);
+
+    ui->host->setText("127.0.0.1");
+    ui->port->setText("34953");
+
+    ui->sendData->setText(R"({"fm_cmd": "put_store_info","fm_ver": "1.0","store_info":{"operator_id": "00000002","pos_id": "1","store_id": "208888","business_date": "20150701"}})");
 }
 
 MainForm::~MainForm()

fmTestClient/mainForm.ui

@@ -64,6 +64,9 @@
      <height>20</height>
     </rect>
    </property>
+   <property name="text">
+    <string/>
+   </property>
   </widget>
   <widget class="QLineEdit" name="port">
    <property name="geometry">

run/skin/deaufult.qss

@@ -20,12 +20,12 @@ QWidget
 {
 	border-image: url(:logo_1.png);
 }
-#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther
+#mainBtnZTD,#mainBtnTSD,#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther
 {
 	color: #e4d0cd;
 	border-image: url(:tabBtn_normal.png);
 }
-#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOther:checked
+#mainBtnZTD:checked,#mainBtnTSD:checked,#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOther:checked
 {
 	color: #262626;
 	border-image: url(:tabBtn_checked.png);
@@ -103,12 +103,13 @@ QWidget
 {
 	color: rgb(172, 219, 169);
 }
-#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther
+#mainTableTSD,#mainTableZTD,#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther
 {
 	font: 11pt "微软雅黑";
 	color: rgb(98, 98, 98);
 	selection-background-color: #f4f4f4;
 }
+#mainTableTSD QHeaderView::section,#mainTableZTD QHeaderView::section,
 #mainTableNew QHeaderView::section,#mainTableMake QHeaderView::section,
 #mainTableSend QHeaderView::section,#mainTableFinsh QHeaderView::section,
 #mainTableRefund QHeaderView::section,#mainTableOther QHeaderView::section
@@ -465,6 +466,12 @@ QWidget
 {
     height: 0px;
 }
+
+#detailTable0::item {
+     min-height: 35; max-height: 35;
+     border-bottom: 1px solid #d9d9d9;
+     border-right: 1 solid #d9d9d9;
+}
 /*---------------------------------DetailForm[ end ]---------------------------------*/
 /*---------------------------------RejectForm[start]-------------------------------------*/
 #RejectForm

run/skin/make.bat

-rcc -binary deaufult.qrc -o ../../../build/takeaway-Debug/fmTakeaway/debug/skin/deaufult.rcc
+rcc -binary deaufult.qrc -o deaufult.rcc
\ No newline at end of file