1.修复部分中文乱码问题. 2.修改会员支付时，总支付金额的计算方式。 3.修复会员支付时，在支付界面输入的小数有时会发生精度损失的问题。

fmnetwork.cpp

@@ -58,6 +58,9 @@ int FMNetwork::send(const QString &url, const QByteArray &reqData, QByteArray &r
             errorMsg = netErrInfo(err);
         }
     }else{
+        disconnect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+        reply->abort();
+        reply->deleteLater();
         error = FM_API_TIMEOUT;
     }
     return error;

fmp_vip_server.cpp

@@ -28,8 +28,8 @@ void FMPVipServer::Listen(quint16 port)
 
 void FMPVipServer::Write(const QByteArray &data)
 {
-    if(socket->write(data) == -1) {
-        FMP_ERROR() << "Write error: " <<socket->error() << socket->errorString();
+    if(!socket || socket->write(data) == -1) {
+        FMP_ERROR() << "Write error: " << (socket ? socket->errorString() : "connection closed.");
     }
 }
 
@@ -44,7 +44,7 @@ void FMPVipServer::onNewConnection()
 void FMPVipServer::onDisconnected()
 {
     FMP_DEBUG() << "Socket disconnected.";
-    socket->deleteLater();
+    socket->close();
 }
 
 void FMPVipServer::onReadyRead()
@@ -58,9 +58,12 @@ void FMPVipServer::onReadyRead()
     }
 
     QByteArray rspData;
-//    qDebug() << recvData.mid(sizeof(FMSOCKEHEADER));
-    qDebug() << QString(recvData.mid(sizeof(FMSOCKEHEADER))).toUtf8();
     dispatcher->doTask(recvData.mid(sizeof(FMSOCKEHEADER)), rspData);
 
     Write(rspData);
+    
+    socket->waitForBytesWritten();
+    socket->close();
+    socket->deleteLater();
+    socket = nullptr;
 }

global.h

@@ -260,7 +260,7 @@ enum {
 // 返回错误信息的json
 #define ErrorMsgJson    "{\"statusCode\":%1,\"msg\":\"%2\",\"prompt\":0}"
 #define ErrorNeedPayCode "fmv:请使用支付码付款"
-typedef std::map<const int, const char*> FMErrorMap;
+typedef std::map<const int, const QString> FMErrorMap;
 
 const FMErrorMap::value_type fm_error_pairs[] =
 {
@@ -273,7 +273,7 @@ const FMErrorMap::value_type fm_error_pairs[] =
     FMErrorMap::value_type(FM_API_WINDOWCLOSE, "窗口关闭")
 };
 
-const FMErrorMap fm_error(fm_error_pairs, fm_error_pairs + (sizeof fm_error_pairs / sizeof fm_error_pairs[0]));
+const FMErrorMap fm_error(fm_error_pairs, fm_error_pairs + (sizeof(fm_error_pairs) / sizeof(fm_error_pairs[0])));
 
 #endif
 

task/fmtask.h

@@ -12,7 +12,30 @@
         function##();                   \
         if(error() != FM_API_SUCCESS) { \
             FMP_WARN() << QString("Task error %1: %2").arg(error()).arg(errorString());   \
-            return QString(ErrorMsgJson).arg(error()).arg(errorString()).toLatin1();    \
+            QString msg = ErrorMsgJson;\
+            msg = msg.arg(error());\
+            switch(error())\
+            {\
+            case FM_API_ERROR: \
+                 msg = msg.arg(QStringLiteral("失败"));\
+                 break;\
+            case FM_API_TIMEOUT:\
+                 msg = msg.arg(QStringLiteral("网络超时"));\
+                 break;\
+            case FM_API_BADJSON:\
+                 msg = msg.arg(QStringLiteral("无效的JSON数据"));\
+                 break;\
+            case FM_API_NETWORERROR:\
+                 msg = msg.arg(QStringLiteral("网络错误"));\
+                 break;\
+            case FM_API_SERVERERROR:\
+                 msg = msg.arg(QStringLiteral("服务器错误"));\
+                 break;\
+            case FM_API_WINDOWCLOSE:\
+                 msg = msg.arg(QStringLiteral("窗口关闭"));\
+                 break;\
+            }\
+            return msg.toUtf8();    \
         }                               \
 } while(0);
 

task/taskfinal.cpp

@@ -60,10 +60,10 @@ void TaskFinal::packageServerReq()
     foreach(auto p, getPosJsonValue(PosProps.Pay_ids).toArray())
     {
         QJsonObject pay;
-        pay["amount"] = p.toObject()["pay_amount"];
-        pay["thirdPayTransId"] = "";
+        pay["amount"] = p.toObject()["pay_amount"].toInt();
+        pay["thirdPayTransId"] = p.toObject()["thirdPayTransId"].toString();
         pay["code"] = p.toObject()["code"].toString();
-        pay["transId"] = getPosJsonValue("trans_id");
+        pay["transId"] = getPosJsonValue("trans_id").toString();
         pay["payTransId"] = p.toObject()["pay_transId"].toString();
         QString typeModeFlag = p.toObject()["pay_id"].toString();
         
@@ -86,62 +86,37 @@ void TaskFinal::packageServerReq()
                 pay["typeModeFlag"] = 20003;
             }
         }
+        else if(typeModeFlag == "7")
+        {
+            //支付宝钱包
+            pay["typeModeFlag"] = 10001; 
+        }
+        else if(typeModeFlag == "9")
+        {
+            //微信钱包
+            pay["typeModeFlag"] = 10004; //
+        }
+        else if(typeModeFlag == "2")
+        {
+            //银行卡
+            pay["typeModeFlag"] = 10011;
+        }
+        else if(typeModeFlag == "8")
+        {
+            //翼支付
+            pay["typeModeFlag"] = 10010;
+        }
         else
         {
             pay["typeModeFlag"] = typeModeFlag.toInt();
-            FMP_ERROR() << "未知的支付类型: " << typeModeFlag;
+            FMP_ERROR() << QStringLiteral("未知的支付类型: ") << typeModeFlag;
         }
         
-//        if(typeModeFlag == "0")
-//        {
-//            //现金支付
-//            pay["typeModeFlag"] = 20005;
-//        }
-//        else if(typeModeFlag == "2")
-//        {
-//            //银行卡
-//            pay["typeModeFlag"] = 10011;
-//        }
-//        else if(typeModeFlag == "7")
-//        {
-//            //支付宝钱包
-//            pay["typeModeFlag"] = 10001; 
-//        }
-//        else if(typeModeFlag == "77")
-//        {
-//            //商品券
-//            pay["typeModeFlag"] = 20004;
-//        }
-//        else if(typeModeFlag == "8")
-//        {
-//            //翼支付
-//            pay["typeModeFlag"] = 10010;
-//        }
-//        else if(typeModeFlag == "76")
-//        {
-//            //代金券
-//            pay["typeModeFlag"] = 20003;
-//        }
-//        else if(typeModeFlag == "9")
-//        {
-//            //微信钱包
-//            pay["typeModeFlag"] = 10004; //???
-//        }
-//        else if(typeModeFlag == "20001")
-//        {
-//            //会员储值金支付
-//            pay["typeModeFlag"] = 20001;
-//        }
-//        else if(typeModeFlag == "20002")
+//        if(typeModeFlag == "20002")
 //        {
 //            //积分支付
 //            pay["typeModeFlag"] = 20002;
 //        }
-//        else
-//        {
-//            pay["typeModeFlag"] = typeModeFlag.toInt();
-//            FMP_ERROR() << "未知的支付类型: " << typeModeFlag;
-//        }
         
         payList.append(pay);
     }
@@ -182,6 +157,7 @@ bool TaskFinal::sendToServer(bool isShowMsg)
     } else {
         QJsonParseError jsonErr;
         QJsonDocument rspJson = QJsonDocument::fromJson(rspData, &jsonErr);
+        qDebug() << rspJson;
 
         // Json错误
         if(jsonErr.error != QJsonParseError::NoError) {

task/tasklogin.cpp

@@ -30,8 +30,18 @@ TaskLogin::TaskLogin(QJsonObject &jsonObj, Session *session, QObject *parent)
 QByteArray TaskLogin::doTask()
 {
     FMP_DEBUG() << __FUNCTION__;
-    RunFunction(setWindow);
-    RunFunction(showWindow);
+    //根据请求中是否有member_sign字段，判断是否是退货时发起的认证
+    if(posReqJsonObj.contains("member_sign"))
+    {
+        //直接保存member_sign到_session中
+        session()->addData("code", posReqJsonObj["member_sign"].toString());
+        onLogin();
+    }
+    else
+    {
+        RunFunction(setWindow);
+        RunFunction(showWindow);
+    }
     RunFunction(packagePOSRsp);
 
     QJsonDocument json(posRspJsonObj);
@@ -252,7 +262,10 @@ void TaskLogin::onLogin()
 //    if(_window!=nullptr) {
 //        _window->resetWnd();
 //    }
-    _window->close();
+    if(_window != nullptr)
+    {
+        _window->close();
+    }
 }
 
 //QString TaskLogin::sign() const

task/taskpay.cpp

@@ -162,9 +162,10 @@ void TaskPay::packageServerReq()
     serverReqJsonObj["partnerId"] = PARTNER_ID;
 
     QJsonObject transaction;
+    int payAmount = 0; //该次会员支付的总金额
     transaction["memberTransId"] = "";
     transaction["account"] = getPosJsonValue("fm_open_id");
-    transaction["payAmount"] = getPosJsonValue("need_amount");
+//    transaction["payAmount"] = getPosJsonValue("need_amount");
     transaction["isUseScore"] = session()->data("isUseScore").toInt();
 
     QJsonArray products;
@@ -187,6 +188,7 @@ void TaskPay::packageServerReq()
     balance["typeModeFlag"]  = 20001;
     balance["code"] = "";
     payList.push_back(balance);
+    payAmount += session()->data("codeAmount").toInt();
 
     //积分支付详情(天福目前没有积分支付)
     if(transaction["isUseScore"].toInt())
@@ -197,6 +199,7 @@ void TaskPay::packageServerReq()
         score["typeModeFlag"] = 20002;
         score["code"] = "";
         payList.push_back(score);
+        payAmount += session()->data("score").toInt();
     }
 
     //代金券/商品券支付详情
@@ -209,10 +212,12 @@ void TaskPay::packageServerReq()
         coupon["typeModeFlag"] = it.value().value<Coupon>().typeModeFlag;
         coupon["code"] = it.value().value<Coupon>().code;
         payList.push_back(coupon);
+        payAmount += it.value().value<Coupon>().disAmount;
     }
 
     transaction["products"] = products;
     transaction["payList"] = payList;
+    transaction["payAmount"] = payAmount;
 
     serverReqJsonObj[PosProps.Transaction] = transaction;
     serverReqJsonObj["t"] = QString::number(QDateTime::currentMSecsSinceEpoch());
@@ -286,15 +291,15 @@ void TaskPay::packagePOSRsp()
     typeModeFlags[20002] = "20002"; //会员积分支付
     //支付方式描述
     QMap<int, QString> description;
-    description[20001] = "会员储值金支付";
-    description[20002] = "会员积分支付";
-    description[20003] = "代金券支付";
-    description[20004] = "商品券支付";
-    description[20005] = "现金支付";
-    description[10011] = "银行卡支付";
-    description[10001] = "支付宝支付";
-    description[10010] = "翼支付";
-    description[10004] = "微信支付";
+    description[20001] = QStringLiteral("会员储值金支付");
+    description[20002] = QStringLiteral("会员积分支付");
+    description[20003] = QStringLiteral("代金券支付");
+    description[20004] = QStringLiteral("商品券支付");
+    description[20005] = QStringLiteral("现金支付");
+    description[10011] = QStringLiteral("银行卡支付");
+    description[10001] = QStringLiteral("支付宝支付");
+    description[10010] = QStringLiteral("翼支付");
+    description[10004] = QStringLiteral("微信支付");
 
     //计算总支付额
     int totalPaid = 0;

windows/fmviporder.cpp

@@ -66,8 +66,7 @@ void FMVipOrder::initWnd(Session *se)
 void FMVipOrder::on_pay_btn_clicked()
 {
     session()->addData("payCouponMap", orderInfo->selectCouponMap);
-    //int codeAmount = orderInfo->getPayAmount(ui->pay_edit->text());
-    double codeAmount = orderInfo->getMaxWillPay() * 100;
+    int codeAmount = orderInfo->getPayAmount(ui->pay_edit->text());
     session()->addData("codeAmount", codeAmount);
     session()->addData("isUseScore", orderInfo->isUseScore());
 
@@ -108,7 +107,6 @@ void FMVipOrder::onItemClicked(QListWidgetItem *item)
                 FMMsgWnd::WarningWnd(QString::fromLocal8Bit("请注意代金券总额已超过待付金额！"), this);
             }
         }
-        setWillPayText();
     }
     else if(orderInfo->couponMap()[code].typeModeFlag == 20004) //商品券
     {
@@ -133,6 +131,7 @@ void FMVipOrder::onItemClicked(QListWidgetItem *item)
             }
         }
     }
+    setWillPayText();
 }
 
 void FMVipOrder::initCouponItems()

windows/fmviporder.h

@@ -78,11 +78,8 @@ private:
 
         int getPayAmount(QString amountStr)
         {
-            qDebug() << amountStr.toDouble();
-            qDebug() << _couponAmount;
-            qDebug() << _useScore;
-            int payAmount = MIN(_needPay, (amountStr.toDouble() + _couponAmount + _useScore)) * 100;
-            return payAmount;
+            double payAmount = MIN(_needPay, (amountStr.toDouble() + _couponAmount + _useScore)) * 100;
+            return QString::number(payAmount).toInt();
         }
 
         // 代金券总额超过待付时返回true