Commit 8c451a96 by 刘帅

面值、实付字段错误

parent 75a22813
...@@ -297,12 +297,12 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json) ...@@ -297,12 +297,12 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
QString ebcode = codeInfo["ebcode"].toString(); QString ebcode = codeInfo["ebcode"].toString();
QString ebname = codeInfo["ebname"].toString(); QString ebname = codeInfo["ebname"].toString();
QString channel = json["channel"].toString(); QString channel = json["channel"].toString();
double realAmount = codeInfo["amount"].toInt()/100.0; double realAmount = codeInfo["amount"].toInt()/100.0; // 面值
double amount = codeInfo["paid"].toInt()/100.0; double amount = codeInfo["paid"].toInt()/100.0; //实付
QString time_name = QString::fromLocal8Bit("有效期至: ").append(QDate::fromString(vdata, "yyyyMMdd").toString("yyyy-MM-dd")); QString time_name = QString::fromLocal8Bit("有效期至: ").append(QDate::fromString(vdata, "yyyyMMdd").toString("yyyy-MM-dd"));
int couponType = json["couponType"].toInt(); int couponType = json["couponType"].toInt();
if( ConsumptionDialog::ShowForUnConsum(act_name, amount, realAmount, channel, "", coupon)) if( ConsumptionDialog::ShowForUnConsum(act_name, realAmount, amount, channel, "", coupon))
{ {
_redeem_json = QJsonObject(); _redeem_json = QJsonObject();
_redeem_json["ver"] = 2; _redeem_json["ver"] = 2;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 83 #define VER_BUILD 90
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment