1. 查询流水界面添加支付渠道项。

sbkpay/control.cpp

@@ -464,7 +464,7 @@ bool Control::GetRSA(QString &error)
     json.insert(JSON_KEY_REQTYPE, 99);
     json.insert(JSON_KEY_STOREID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_STOREID).toString());
     json.insert(JSON_KEY_STATIONID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_STATIONID).toString());
-    json.insert(JSON_KEY_PARTNERID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_PARTNERID).toString());
+    json.insert(JSON_KEY_PARTNERID, FMTool::GetJsonValue(_posReqJsonObj, JSON_KEY_PARTNERID).toInt());
 
     CretOperate::GetDES3MAC(json);
     QByteArray array;

sbkpay/hostwidget.cpp

@@ -282,9 +282,13 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                 item3->setTextAlignment(Qt::AlignCenter);
                 ui->tableWidget->setItem(0, 3, item3);
 
+                if(_posType == SIMPHONY) {
+                    QTableWidgetItem *item4 = new QTableWidgetItem(tmp[JSON_KEY_PAYMENTMETHOD].toString());
+                    item4->setTextAlignment(Qt::AlignCenter);
+                    ui->tableWidget->setItem(0, 4, item4);
+                }
 
-
-                if(_posType!=SPCC) {
+                if(_posType != SPCC) {
                     QWidget *pWdg = new QWidget(ui->tableWidget);
                     QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
                     QPushButton * pBtn = new QPushButton(pWdg);
@@ -296,7 +300,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                     hLayout->addWidget(pBtn);
                     hLayout->setMargin(0);
                     pWdg->setLayout(hLayout);
-                    ui->tableWidget->setCellWidget(0, 4, pWdg);   // 操作按钮
+                    ui->tableWidget->setCellWidget(0, ui->tableWidget->columnCount()-1, pWdg);   // 操作按钮
                     pBtn->setStyleSheet("border:0px;border-radius:2px;background-color: rgb(0, 179, 238);font: 75 20px \"Microsoft YaHei UI Light\";");
 
                     qDebug() << "********************-----------*******************" << tmp;
@@ -446,48 +450,55 @@ void HostWidget::ShowWiteMGS(ReqType type, bool flag, QString message)
 
     if(type == endday)
     {
-//        _need_exit = true;
-//        _label_wait_timer->stop();
-//        ui->label_wait_time_lod->setVisible(false);
-//        ui->label_wait_title->show();
-//        ui->btn_wait_quit->show();
-//        ui->btn_wait_quit->setText(QString::fromLocal8Bit("确认"));
-
-//        if(flag) {
-//            ui->label_wait_msg_time->setVisible(true);
-//            _label_wait_timer->setLabel(ui->label_wait_msg_time);
-//            _label_wait_timer->start(3);
-//            ui->label_wait_title->setText(message);
-//            ui->label_wait_time->setPixmap(QPixmap(":res/success.png"));
-//        } else {
-//            ui->label_wait_title->setText(message);
-//            ui->label_wait_time->setPixmap(QPixmap(":res/warning.png"));
-//        }
+        if(_posType == SPCC) {
             emit Exits();
+        } else {
+            _need_exit = true;
+            _label_wait_timer->stop();
+            ui->label_wait_time_lod->setVisible(false);
+            ui->label_wait_title->show();
+            ui->btn_wait_quit->show();
+            ui->btn_wait_quit->setText(QString::fromLocal8Bit("确认"));
+
+            if(flag) {
+                ui->label_wait_msg_time->setVisible(true);
+                _label_wait_timer->setLabel(ui->label_wait_msg_time);
+                _label_wait_timer->start(3);
+                ui->label_wait_title->setText(message);
+                ui->label_wait_time->setPixmap(QPixmap(":res/success.png"));
+            } else {
+                ui->label_wait_title->setText(message);
+                ui->label_wait_time->setPixmap(QPixmap(":res/warning.png"));
+            }
+        }
         return ;
     }
 
 
     if(type == shift)
     {
-//        _need_exit = true;
-//        _label_wait_timer->stop();
-//        ui->label_wait_time_lod->setVisible(false);
-//        ui->label_wait_title->show();
-//        ui->btn_wait_quit->show();
-//        ui->btn_wait_quit->setText(QString::fromLocal8Bit("确认"));
-
-//        if(flag) {
-//            ui->label_wait_msg_time->setVisible(true);
-//            _label_wait_timer->setLabel(ui->label_wait_msg_time);
-//            _label_wait_timer->start(3);
-//            ui->label_wait_title->setText(message);
-//            ui->label_wait_time->setPixmap(QPixmap(":res/success.png"));
-//        } else {
-//            ui->label_wait_title->setText(message);
-//            ui->label_wait_time->setPixmap(QPixmap(":res/warning.png"));
-//        }
+        if(_posType == SPCC) {
             emit Exits();
+        } else {
+            _need_exit = true;
+            _label_wait_timer->stop();
+            ui->label_wait_time_lod->setVisible(false);
+            ui->label_wait_title->show();
+            ui->btn_wait_quit->show();
+            ui->btn_wait_quit->setText(QString::fromLocal8Bit("确认"));
+
+            if(flag) {
+                ui->label_wait_msg_time->setVisible(true);
+                _label_wait_timer->setLabel(ui->label_wait_msg_time);
+                _label_wait_timer->start(3);
+                ui->label_wait_title->setText(message);
+                ui->label_wait_time->setPixmap(QPixmap(":res/success.png"));
+            } else {
+                ui->label_wait_title->setText(message);
+                ui->label_wait_time->setPixmap(QPixmap(":res/warning.png"));
+            }
+        }
+
         return ;
     }
 
@@ -651,7 +662,10 @@ void HostWidget::on_btn_find_check_clicked()
     QStringList headerString;
     QList<double> widthScale;
     headerString<<QString::fromLocal8Bit("订单编号")<<QString::fromLocal8Bit("订单金额")<<QString::fromLocal8Bit("订单时间")<<QString::fromLocal8Bit("支付状态");
-    if(_posType==SIMPHONY) {
+    if(_posType == SIMPHONY) {
+        headerString << QString::fromLocal8Bit("支付渠道");
+    }
+    if(_posType != SPCC) {
         headerString << QString::fromLocal8Bit("操作");
     }
 
@@ -661,15 +675,16 @@ void HostWidget::on_btn_find_check_clicked()
         break;
     case 5:
         widthScale << 0.35 << 0.15 << 0.21 << 0.15 << 0.14;
+        break;
+    case 6:
+        widthScale << 0.32 << 0.13 << 0.18 << 0.13 << 0.12 << 0.12;
+        break;
     default:
         break;
     }
 
     int width  = ui->widget_find_main->width() - 4;
 
-    qDebug() << "===========" << width;
-
-    //ui->tableWidget->setColumnWidth(0,1/10.0*width);
     ui->tableWidget->horizontalHeader()->setStyleSheet("QHeaderView::section{border: 0px;font: 75 18px \"Microsoft YaHei UI Light\";}");
     ui->tableWidget->horizontalHeader()->setFixedHeight(25); //设置表头的高度
 
@@ -679,11 +694,6 @@ void HostWidget::on_btn_find_check_clicked()
         ui->tableWidget->setColumnWidth(i, widthScale[i]*width);
     }
 
-//    ui->tableWidget->setColumnWidth(0,5/14.0*width);
-//    ui->tableWidget->setColumnWidth(1,2/14.0*width);
-//    ui->tableWidget->setColumnWidth(2,3/14.0*width);
-//    ui->tableWidget->setColumnWidth(3,2/14.0*width);
-
     ui->tableWidget->setHorizontalHeaderLabels(headerString);
 
     ui->frame->hide();

sbkpay/main.cpp

@@ -422,7 +422,7 @@ int main(int argc, char *argv[])
 
 //    control.Start(as, b);
 
-    char spccIn[MAX_BUF_LEN] = "{\"fmId\":\"0123456789012345678\",\"reqType\":451,\"storeId\":\"1713\",\"stationId\":\"1\",\"partnerId\":1443,\"operatorId\":\"sssaw\",\"transId\":\"52342342323806\",\"transAmount\":8000,\"partnerOrderId\":\"909911039993720192019\",\"businessDate\":\"20170508\",\"products\":[{\"pid\":\"123\",\"name\":\"中杯拿铁\",\"price\":321,\"salesType\":\"NORMAL\"}]}";
+    char spccIn[MAX_BUF_LEN] = "{\"fmId\":\"0123456789012345678\",\"reqType\":452,\"storeId\":\"17607\",\"stationId\":\"1\",\"partnerId\":1443,\"operatorId\":\"0123\",\"transId\":301439,\"transAmount\":1,\"partnerOrderId\":909911039990170830002,\"businessDate\":\"20170508\",\"products\":[{\"pid\":\"123\",\"name\":\"中杯拿铁\",\"price\":321,\"salesType\":\"NORMAL\"}]}";
     control.Start(spccIn, b);
 
     return a.exec();

sbkpay/sbkpay.pro

@@ -17,7 +17,7 @@ LIBS += -L$$PWD/lib -llibeay32 -lssleay32
 
 CONFIG += C++11 SBKDLL1
 
-DEFINES += MOCK
+#DEFINES += MOCK
 
 include($$PWD/qtwinmigrate/src/qtwinmigrate.pri)