修改卡券核销时，商品信息的传递方式

fmp_epay_p.cpp

@@ -230,7 +230,7 @@ void FMPePayPrivate::Init()
                     return;
                 }
             }
-            QJsonArray pos_products = _origin_request["products"].toArray();
+            QJsonArray pos_products = trans["products"].toArray();
             QJsonArray products;
             int i = 1;
             foreach (QJsonValue v, pos_products) {
@@ -278,11 +278,6 @@ void FMPePayPrivate::DockPayRequest(const QByteArray &json)
     FMP_INFO() << "pay request json:" <<json;
 }
 
-QJsonObject FMPePayPrivate::GetRequestInfo()
-{
-    return _origin_request;
-}
-
 #define FMP_EPAY_STATUSCODE         "statusCode"
 #define FMP_EPAY_ERRORMSG           "msg"
 #define FMP_EPAY_FMID               "fm_id"

fmp_epay_p.h

@@ -69,8 +69,6 @@ public:
     bool                HttpPost(QJsonObject& outjson, QJsonObject json, QString &error, int timeout = 60);
 
     void                GetDailyBillData(QVector<PayDetail> &vecPay);
-
-    QJsonObject         GetRequestInfo();
     
 private:
     void                ControlReverseJson();

fmp_epayview_dialog.cpp

@@ -183,10 +183,11 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
 //        ui->btn_pay->setEnabled(false);
     }
     QPushButton* redeem = new QPushButton(QString::fromLocal8Bit("卡券支付"), this);
-    redeem->setStyleSheet("width:250px");
+    redeem->setStyleSheet("width:220px");
     connect(redeem, &QPushButton::clicked, this, &FMPPayDialog::redeem);
     QVBoxLayout* layout = qobject_cast<QVBoxLayout*>(ui->frame->layout());
     layout->insertWidget(4, redeem);
+    _products_info = basicinfo["products"].toJsonArray();
 
     setShowFunc();
 }
@@ -1106,8 +1107,7 @@ void FMPPayDialog::redeem()
     double needPay = ui->lineedit_num->text().toDouble();
     FMPRedeemInterface* redeem = FMP::GetService<FMPRedeemInterface>();
     redeem->StartService();
-    QJsonObject requestInfo = _control->GetRequestInfo();
-    QJsonObject result = redeem->Redeem(needPay, requestInfo);
+    QJsonObject result = redeem->Redeem(needPay, _products_info);
     FMP_DEBUG() << "redeem result: " << result;
     needPay -= result["discount"].toDouble();
     ui->lineedit_num->setText(QString::number(qMax(0.0, needPay)));

fmp_epayview_dialog.h

@@ -152,6 +152,7 @@ private:
     bool _is_api;
     bool _api_force_close;
     QPoint      _mMovePosition;
+    QJsonArray  _products_info;
 };
 
 #endif // DIALOG_H