Merge remote-tracking branch 'origin/XianFeng' into xianfeng

fmTakeaway/Control/flowControl.cpp

@@ -287,6 +287,7 @@ bool FlowControl::_PullOrder()
                                ProductObject *dish = new ProductObject;
                                dish->pid = itemObj["pid"].toString();
                                dish->name = itemObj["name"].toString();
+                               dish->productAmount = itemObj["product_amount"].toInt();
                                orderObject->refund_products.append(dish);
                             }
                             orderObject->refund_total_fee = recvJson["refund_info"].toObject()["refund_total"].toInt();

fmTakeaway/detailForm.cpp

@@ -94,6 +94,7 @@ void DetailForm::InitData(OrderObject *orderObject)
         ui->detailTable0->insertRow(rowCount);
         ui->detailTable0->setItem(rowCount,0,new QTableWidgetItem(QString("退款商品")));
         ui->detailTable0->item(rowCount, 0)->setTextAlignment(Qt::AlignCenter);
+        ui->detailTable0->item(rowCount, 0)->setTextColor(QColor("red"));
         rowCount++;
 
         foreach(ProductObject* pProduct, orderObject->refund_products)
@@ -101,14 +102,21 @@ void DetailForm::InitData(OrderObject *orderObject)
             ui->detailTable0->insertRow(rowCount);
             ui->detailTable0->setItem(rowCount, 0, new QTableWidgetItem(pProduct->name));  // 商品名
             ui->detailTable0->item(rowCount, 0)->setTextAlignment(Qt::AlignCenter);
+            ui->detailTable0->item(rowCount, 0)->setTextColor(QColor("red"));
+
+            ui->detailTable0->setItem(rowCount, 2, new QTableWidgetItem(pProduct->productAmount));  // 数量
+            ui->detailTable0->item(rowCount, 2)->setTextAlignment(Qt::AlignCenter);
+            ui->detailTable0->item(rowCount, 2)->setTextColor(QColor("red"));
             rowCount++;
         }
 
         ui->detailTable0->insertRow(rowCount);
         ui->detailTable0->setItem(rowCount,0,new QTableWidgetItem(QString("退款总额")));
         ui->detailTable0->item(rowCount, 0)->setTextAlignment(Qt::AlignCenter);
+        ui->detailTable0->item(rowCount, 0)->setTextColor(QColor("red"));
         ui->detailTable0->setItem(rowCount, 1, new QTableWidgetItem(Penny2Dollar(orderObject->refund_total_fee)));  // 商品总价
         ui->detailTable0->item(rowCount, 1)->setTextAlignment(Qt::AlignCenter);
+        ui->detailTable0->item(rowCount, 1)->setTextColor(QColor("red"));
     }
 
     QString records;

fmTakeaway/mainForm.cpp

@@ -123,7 +123,7 @@ void MainForm::_Init()
 
     // 初始化文字
     ui->mainLabStoreid->setText(UI_STOREID);
-    ui->mainLabVersion->setText("1.3.8");
+    ui->mainLabVersion->setText("1.3.9");
     ui->mainLabCashier->setText(UI_CASHIER);
 
     // 初始化表