提交

fmPrinter/fmPrinter.cpp

-#include "fmPrinter.h"
+#include "fmPrinter.h"
 #include <QFile>
 #include <QCoreApplication>
 #include <QDateTime>
@@ -71,7 +71,11 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
             if( !pObj->sub_products.isEmpty() )
             {
                 str_comd_list.append(QString(">>>>>>#"));
-                str_comd_list.append(QString("[套餐名]"+pObj->name+"#"));
+
+                QString price = QString("%1   x%2   %3").arg(_Penny2Dollar(pObj->price)).arg(pObj->productAmount)
+                        .arg(_Penny2Dollar(pObj->price*pObj->productAmount));
+                str_comd_list.append(QString("[套餐名]" + pObj->name + "#" + price + "#"));
+
                 foreach(ProductObject *sun_pObj, pObj->sub_products)
                 {
                     QString name, price;
@@ -117,7 +121,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
         result_str.append("|");
         result_str.append(pData->delivery_time>0?QDateTime::fromTime_t(pData->delivery_time).toString("yy-MM-dd hh:mm"):"立即送达");
         result_str.append("|");
-        result_str.append(pData->remark.isEmpty()?"null":pData->remark.replace("\r\n", ""));
+        result_str.append(pData->remark.isEmpty()?"null":pData->remark.replace("\r\n", "").replace("|", "").replace("#", ""));
         result_str.append("|");
         result_str.append(pData->has_invoiced?"是": "null");
 
@@ -148,7 +152,7 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
         result_str.append("|");
         result_str.append(_Penny2Dollar(pData->send_fee));
         result_str.append("|");
-        result_str.append(_Penny2Dollar(pData->total_fee)); // 订单总金额
+        result_str.append(_Penny2Dollar(!pData->channelName.compare("非码微店") ? pData->total_fee-pData->dis_shop_fee : pData->total_fee)); // 订单总金额
         result_str.append("|");
 
         // 减去商家优惠金额

fmTakeaway/Control/flowControl.cpp

-#include "flowControl.h"
+#include "flowControl.h"
 #include "fmPlugin.h"
 #include "fmPrinter.h"
 #include "QsLog.h"
@@ -221,6 +221,7 @@ bool FlowControl::_PullOrder()
                 {
                     //新数据
                     orderObject = new OrderObject(this);
+
                     orderObject->FromJson(jsonObject);
                     if(QDateTime::fromTime_t(orderObject->create_time).date() == QDate::currentDate()
                             || ((orderObject->order_type == 2)   && (orderObject->status != 6)) )
@@ -276,10 +277,10 @@ bool FlowControl::_PullOrder()
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
 
-                    if(oldStatus != orderObject->status)
-                    {
+                    //if(oldStatus != orderObject->status)
+                    //{
                         emit changeOrderStatus(orderObject, oldStatus);
-                    }
+                    //}
 
                     if(orderObject->delivery_status==2 && orderObject->status==2)
                     {
@@ -311,7 +312,7 @@ bool FlowControl::_PullOrder()
 
 
 
-                if(orderObject->status == 22 && orderObject->refundProList.isEmpty())
+                if(orderObject->refund_status == 22 && orderObject->refundProList.isEmpty())
                 {
                     QString error;
                     bool result;
@@ -322,8 +323,9 @@ bool FlowControl::_PullOrder()
 
                     QLOG_INFO() << QString("[---get refundDetail---][requestData:%1]").arg(_GetJsonStr(sendJson));
                     result = m_pullOrderSocket->Request(sendJson, recvJson, error);
-                    QLOG_INFO() << QString("get refundDetail finsh. [result:%1][msg:%2]")
-                                   .arg(result).arg(error);
+                    QLOG_INFO() << QString("get refundDetail finsh. [result:%1][msg:%2][recvJson:%3]")
+                                   .arg(result).arg(error).arg(_GetJsonStr(recvJson));
+
                     if( recvJson["statusCode"].toInt() == 100 )
                     {
                         QJsonArray items = recvJson["refund_info"].toObject()["refund_items"].toArray();

fmTakeaway/DTools/util.cpp

-#include "util.h"
+#include "util.h"
 #include "preDefine.h"
 
 QString Penny2Dollar(int penny)
@@ -7,8 +7,12 @@ QString Penny2Dollar(int penny)
     return QString::number(dollar,'f',2);
 }
 
-QString GetOperByStatus(int status)
+QString GetOperByStatus(int status, int refundStatus)
 {
+    if(refundStatus == 20 || refundStatus == 22)
+    {
+        return OPERATION_AGREEREFUND;
+    }
     switch(status)
     {
     case 1:
@@ -35,8 +39,12 @@ QString GetOperByStatus(int status)
     }
 }
 
-QString GetOperNameByStatus(int status)
+QString GetOperNameByStatus(int status, int refundStatus)
 {
+    if(refundStatus == 20 || refundStatus == 22)
+    {
+        return OPERATIONNAME_AGREEREFUND;
+    }
     switch(status)
     {
     case 1:

fmTakeaway/DTools/util.h

-#ifndef UTIL_H
+#ifndef UTIL_H
 #define UTIL_H
 
 #include <QString>
@@ -12,11 +12,11 @@ QString Penny2Dollar(int penny);
  * 参数:[1]订单状态
  * 返回:元
  * */
-QString GetOperByStatus(int status);
+QString GetOperByStatus(int status, int refundStatus);
 /* 功能:根据订单状态获取操作名
  * 参数:[1]订单状态
  * 返回:元
  * */
-QString GetOperNameByStatus(int status);
+QString GetOperNameByStatus(int status, int refundStatus);
 
 #endif // UTIL_Hutil

fmTakeaway/Model/orderObject.cpp

-#include "orderObject.h"
+#include "orderObject.h"
 #include "preDefine.h"
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -34,6 +34,16 @@ QString OrderObject::toString()
     return QString(QJsonDocument(json).toJson().simplified());
 }
 
+int OrderObject::getrefund_status() const
+{
+    return refund_status;
+}
+
+void OrderObject::setrefund_status(const int &v)
+{
+    refund_status = v;
+}
+
 int OrderObject::getpackage_fee() const
 {
     return package_fee;

fmTakeaway/Model/orderObject.h

-#ifndef ORDEROBJECT_H
+#ifndef ORDEROBJECT_H
 #define ORDEROBJECT_H
 
 #include "productObject.h"
@@ -64,6 +64,7 @@ public:
     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 (int package_fee READ getpackage_fee WRITE setpackage_fee)
+    Q_PROPERTY (int refund_status READ getrefund_status WRITE setrefund_status)
 
     QString order_view_id;  //用户看到的订单ＩＤ
     QString address;         //地址
@@ -98,6 +99,7 @@ public:
     int rest_fee;            //未付
     QString status_desc;     //订单状态描述
     int status;              //订单状态
+    int refund_status;       //退款状态
     int shop_fee;            //应收金额(商家和骑士看到的)
     int send_fee;            //运费金额
     QString timestamp;       //时间戳
@@ -118,6 +120,11 @@ public:
     QPushButton* curt_table_btn; //当前订单所在表对应的按钮
 
 protected:
+
+    int getrefund_status() const ;
+    void setrefund_status(const int& v);
+
+
     int getpackage_fee() const ;
     void setpackage_fee(const int& v);
 

fmTakeaway/dailyform.cpp

-#include "dailyform.h"
+#include "dailyform.h"
 #include "ui_dailyform.h"
 #include "fmPrinter.h"
 #include "DTools/configManger.h"
@@ -18,7 +18,7 @@ DailyForm::DailyForm(QWidget *parent) :
     m_map.insert("bdwm", "百度外卖");
     m_map.insert("jdwm", "京东到家");
     m_map.insert("eleme2", "饿了么  ");
-    m_map.insert("fmwd", "非码微店");
+    m_map.insert("fmwd", "官网");
     m_map.insert("mall", "APP ");
 
     ui->daily_table0->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);

fmTakeaway/detailForm.cpp

-#include "detailForm.h"
+#include "detailForm.h"
 #include "ui_detailForm.h"
 #include "DTools/util.h"
 #include "preDefine.h"
@@ -60,7 +60,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab8->setText(orderObject->has_invoiced? QString("发票抬头:%1").arg(orderObject->invoice_title) : "不需要发票");
     ui->detailLab9->setPixmap(Code39().getCode39Map(orderObject->order_id));  // 条码
     ui->detailLab10->setText(QString("-")+Penny2Dollar(orderObject->service_fee));
-    ui->detailLab11->setText(QString("-")+Penny2Dollar(orderObject->dis_shop_fee+orderObject->service_fee));
+    ui->detailLab11->setText("0");
 
     for(int i=0; i<orderObject->proList.count(); i++)
     {
@@ -112,17 +112,18 @@ void DetailForm::InitData(OrderObject *orderObject)
     {
         ui->detailBtn2->hide();
     }
-    if(orderObject->status==20||orderObject->status ==22)
+    if(orderObject->refund_status==20||orderObject->refund_status ==22)
     {
         ui->detailBtn2->hide();
     }
 
-    if(orderObject->status==20)
+    if(orderObject->refund_status==20)
     {
         ui->detailLabNotice->setText("该订单为全额退款");
+        ui->detailLab11->setText("全额退款");
     }
 
-    if(orderObject->status==22)
+    if(orderObject->refund_status==22)
     {
         ui->detailLabNotice->setText("该订单为部分退款");
 
@@ -131,6 +132,8 @@ void DetailForm::InitData(OrderObject *orderObject)
         ui->detailTable0->setItem(count,0,new QTableWidgetItem(QString("退款商品")));
         ui->detailTable0->item(count, 0)->setTextAlignment(Qt::AlignCenter);
 
+        ui->detailLab11->setText(Penny2Dollar(orderObject->refund_total_fee));
+
         for(int i=0; i<orderObject->refundProList.count(); i++)
         {
             int row = i+count+1;
@@ -147,17 +150,17 @@ void DetailForm::InitData(OrderObject *orderObject)
         }
     }
 
-    ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status));
-    ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status));
+    ui->detailBtn3->setText(GetOperNameByStatus(orderObject->status, orderObject->refund_status));
+    ui->detailBtn3->setProperty("operation", GetOperByStatus(orderObject->status, orderObject->refund_status));
     ui->detailBtn3->setProperty("orderId", orderObject->order_id);
 
-    if(orderObject->status==2 || orderObject->status==4)
+    if((orderObject->status==2 || orderObject->status==4) && (orderObject->refund_status != 20) && (orderObject->refund_status != 22))
     {
         ui->detailBtn3->hide();
     }
 
 
-    if(!GetOperByStatus(orderObject->status).compare("NULL"))
+    if(!GetOperByStatus(orderObject->status, orderObject->refund_status).compare("NULL"))
     {
         ui->detailBtn3->hide();
     }

fmTakeaway/detailForm.ui

@@ -24,6 +24,14 @@
     <layout class="QHBoxLayout" name="horizontalLayout_17">
      <item>
       <widget class="QLabel" name="detailLabNotice">
+       <property name="font">
+        <font>
+         <pointsize>13</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: rgb(255, 0, 0);</string>
+       </property>
        <property name="text">
         <string/>
        </property>
@@ -995,7 +1003,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>合计:</string>
+                <string>退款金额:</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>

fmTakeaway/mainForm.cpp

-#include "mainForm.h"
+#include "mainForm.h"
 #include "QsLog.h"
 #include "ui_mainForm.h"
 #include "preDefine.h"
@@ -30,6 +30,7 @@ MainForm::MainForm(QWidget *parent) :
     m_tableList.append(ui->mainTableFinsh);
     m_tableList.append(ui->mainTableOther);
     m_tableList.append(ui->mainTableNew);
+    m_tableList.append(ui->mainTableReservation);
     // 注册信号槽参数
     qRegisterMetaType<CashierObject>("CashierObject");
     qRegisterMetaType< QList<CashierObject> >("QList<CashierObject>");
@@ -133,7 +134,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText("1.1.9");
+    ui->mainLabVersion->setText("1.2.2");
     ui->mainLabCashier->setText(UI_CASHIER);
 
     // 初始化表
@@ -293,8 +294,12 @@ void MainForm::_SetTablesSortEnable(bool bEnable)
     }
 }
 
-QPushButton *MainForm::_GetTabBtnByOrderStatus(int orderStatus)
+QPushButton *MainForm::_GetTabBtnByOrderStatus(int orderStatus, int refundStatus)
 {
+    if(refundStatus ==20 || refundStatus==22)
+    {
+        return ui->mainBtnRefund;
+    }
     switch(orderStatus)
     {
     case 1:
@@ -378,12 +383,28 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
         }
     }
     // 将数据插入到表中
-    if(orderObject->status==2 && orderObject->delivery_status==2)
+    if(orderObject->order_type == 2 && orderObject->status==2)
+    {
+        if(orderObject->refund_status == 20 ||orderObject->refund_status == 22)
+        {
+            tabBtn = ui->mainBtnRefund;
+        }else
+        {
+            tabBtn = ui->mainBtnReservation;
+        }
+
+    }else if(orderObject->status==2 && orderObject->delivery_status==2)
+    {
+        if(orderObject->refund_status == 20 ||orderObject->refund_status == 22)
+        {
+            tabBtn = ui->mainBtnRefund;
+        }else
         {
             tabBtn = ui->mainBtnOur;
+        }
     }else
     {
-        tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
+        tabBtn = _GetTabBtnByOrderStatus(orderObject->status, orderObject->refund_status);
     }
 
     orderObject->curt_table_btn = tabBtn;
@@ -410,7 +431,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
 
     if(table == ui->mainTableRefund)
     {
-        QTableWidgetItem *item5 = new QTableWidgetItem(orderObject->status==20?"全额退款":"部分退款");
+        QTableWidgetItem *item5 = new QTableWidgetItem(orderObject->refund_status==20?"全额退款":"部分退款");
         item5->setTextAlignment(Qt::AlignCenter);
         table->setItem(0, 5, item5);  // 订单状态
     }else
@@ -420,6 +441,12 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
         table->setItem(0, 5, item5);  // 下单时间
     }
 
+    if(table == ui->mainTableReservation)
+    {
+        QTableWidgetItem *item6 = new QTableWidgetItem(QDateTime::fromTime_t(orderObject->delivery_time).toString("MM-dd hh:mm"));
+        item6->setTextAlignment(Qt::AlignCenter);
+        table->setItem(0, 6, item6);  // 下单时间
+    }
     if(table == ui->mainTableNew||table == ui->mainTableRefund||table==ui->mainTableOur)
     {
         QWidget *pWdg = new QWidget(table);
@@ -453,7 +480,8 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
          emit startRemind(0);
     }else if(orderObject->order_type ==2 && orderObject->status ==2)
     {
-        emit startRemind(0);
+        //TODO
+        //emit startRemind(0);
     }else if(ui->mainTableRefund->rowCount() > 0)
     {
         emit startRemind(1);

fmTakeaway/mainForm.h

-#ifndef MAINFORM_H
+#ifndef MAINFORM_H
 #define MAINFORM_H
 
 #include <QDialog>
@@ -96,7 +96,7 @@ private:
      * 参数:[1]订单状态
      * 返回:对应的Tab按钮
      * */
-    QPushButton *_GetTabBtnByOrderStatus(int orderStatus);
+    QPushButton *_GetTabBtnByOrderStatus(int orderStatus, int refundStatus);
 
 
 

run/skin/deaufult.qss

@@ -70,13 +70,13 @@ QWidget
 {
 	border-image: url(:logo_1.png);
 }
-#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther,#mainBtnOur
+#mainBtnReservation,#mainBtnNew,#mainBtnMake,#mainBtnSend,#mainBtnFinsh,#mainBtnRefund,#mainBtnOther,#mainBtnOur
 {
 	font: bold 11pt "微软雅黑";
 	color: rgb(98, 98, 98);
 	border-image: url(:tabBtn_normal.png);
 }
-#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOur:checked,#mainBtnOther:checked
+#mainBtnReservation:checked,#mainBtnNew:checked,#mainBtnMake:checked,#mainBtnSend:checked,#mainBtnFinsh:checked,#mainBtnRefund:checked,#mainBtnOur:checked,#mainBtnOther:checked
 {
 	color: rgb(255, 255, 255);
 	border-image: url(:tabBtn_checked.png);
@@ -171,7 +171,7 @@ QWidget
 {
 	color: rgb(172, 219, 169);
 }
-#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther,#mainTableOur
+#mainTableNew,#mainTableMake,#mainTableSend,#mainTableFinsh,#mainTableRefund,#mainTableOther,#mainTableOur,#mainTableReservation
 {
 	font: 11pt "微软雅黑";
 	color: rgb(98, 98, 98);
@@ -179,7 +179,8 @@ QWidget
 }
 #mainTableNew QHeaderView::section,#mainTableMake QHeaderView::section,
 #mainTableSend QHeaderView::section,#mainTableFinsh QHeaderView::section,
-#mainTableRefund QHeaderView::section,#mainTableOther QHeaderView::section,#mainTableOur QHeaderView::section
+#mainTableRefund QHeaderView::section,#mainTableOther QHeaderView::section,
+#mainTableOur QHeaderView::section,#mainTableReservation QHeaderView::section
 {  
 	border: 0px;
 	background: rgb(255, 255, 255);
@@ -188,26 +189,30 @@ QWidget
 } 
 #mainTableNew QHeaderView::down-arrow,#mainTableMake QHeaderView::down-arrow,
 #mainTableSend QHeaderView::down-arrow,#mainTableFinsh QHeaderView::down-arrow,
-#mainTableRefund QHeaderView::down-arrow,#mainTableOther QHeaderView::down-arrow,#mainTableOur QHeaderView::down-arrow
+#mainTableRefund QHeaderView::down-arrow,#mainTableOther QHeaderView::down-arrow,
+#mainTableOur QHeaderView::down-arrow,#mainTableReservation QHeaderView::down-arrow
 {	
 	border: 0px;
 }
 #mainTableNew QHeaderView::up-arrow,#mainTableMake QHeaderView::up-arrow,
 #mainTableSend QHeaderView::up-arrow,#mainTableFinsh QHeaderView::up-arrow,
-#mainTableRefund QHeaderView::up-arrow,#mainTableOther QHeaderView::up-arrow,#mainTableOur QHeaderView::up-arrow
+#mainTableRefund QHeaderView::up-arrow,#mainTableOther QHeaderView::up-arrow,
+#mainTableOur QHeaderView::up-arrow,#mainTableReservation QHeaderView::up-arrow
 {	
 	border: 0px;
 }
 #mainTableNew QScrollBar:vertical,#mainTableMake QScrollBar:vertical,
 #mainTableSend QScrollBar:vertical,#mainTableFinsh QScrollBar:vertical,
-#mainTableRefund QScrollBar:vertical,#mainTableOther QScrollBar:vertical,#mainTableOur QScrollBar:vertical
+#mainTableRefund QScrollBar:vertical,#mainTableOther QScrollBar:vertical,
+#mainTableOur QScrollBar:vertical,#mainTableReservation QScrollBar:vertical
 {
 	background: transparent;
     width: 8px;
 }
 #mainTableNew QScrollBar::handle:vertical,#mainTableMake QScrollBar::handle:vertical,
 #mainTableSend QScrollBar::handle:vertical,#mainTableFinsh QScrollBar::handle:vertical,
-#mainTableRefund QScrollBar::handle:vertical,#mainTableOther QScrollBar::handle:vertical,#mainTableOur QScrollBar::handle:vertical
+#mainTableRefund QScrollBar::handle:vertical,#mainTableOther QScrollBar::handle:vertical,
+#mainTableOur QScrollBar::handle:vertical,#mainTableReservation QScrollBar::handle:vertical
 {
 	border-radius: 6px;
 	background: rgb(64, 119, 61);
@@ -215,13 +220,15 @@ QWidget
 }
 #mainTableNew QScrollBar::add-line:vertical,#mainTableMake QScrollBar::add-line:vertical,
 #mainTableSend QScrollBar::add-line:vertical,#mainTableFinsh QScrollBar::add-line:vertical,
-#mainTableRefund QScrollBar::add-line:vertical,#mainTableOther QScrollBar::add-line:vertical,#mainTableOur QScrollBar::add-line:vertical
+#mainTableRefund QScrollBar::add-line:vertical,#mainTableOther QScrollBar::add-line:vertical,
+#mainTableOur QScrollBar::add-line:vertical,#mainTableReservation QScrollBar::add-line:vertical 
 {
 	height: 0px;
 }
 #mainTableNew QScrollBar::sub-line:vertical,#mainTableMake QScrollBar::sub-line:vertical,
 #mainTableSend QScrollBar::sub-line:vertical,#mainTableFinsh QScrollBar::sub-line:vertical,
-#mainTableRefund QScrollBar::sub-line:vertical,#mainTableOther QScrollBar::sub-line:vertical,#mainTableOur QScrollBar::sub-line:vertical
+#mainTableRefund QScrollBar::sub-line:vertical,#mainTableOther QScrollBar::sub-line:vertical,
+#mainTableOur QScrollBar::sub-line:vertical,#mainTableReservation QScrollBar::sub-line:vertical
 {
 	height: 0px;
 }