加入冲正

FMVip/fmvipdispatcher.cpp

@@ -94,6 +94,12 @@ void FMVipDispatcher::onRequest(const QJsonObject &jsonObj)
     else if (type == Type_Coupon) {
         coupon();
     }
+    else if (type == Type_Order_Refund) {
+        orderRefund();
+    }
+    else if (type == Type_Order_Revoke) {
+        orderRevoke();
+    }
 #ifdef _DEBUG
     else if (type == "-1") {
         qDebug() << "Quit";
@@ -256,6 +262,16 @@ void FMVipDispatcher::final()
     onDoPost();
 }
 
+void FMVipDispatcher::orderRefund()
+{
+    onDoPost();
+}
+
+void FMVipDispatcher::orderRevoke()
+{
+    onDoPost();
+}
+
 BOOL FMVipDispatcher::isLogined()
 {
     QString account = FMVipForward::instance()->sessionData("fm_open_id");

FMVip/fmvipdispatcher.h

@@ -41,6 +41,8 @@ private:
     void coupon();
     void fund();
     void final();
+    void orderRefund();
+    void orderRevoke();
     BOOL isLogined();
 
 protected:

FMVip/fmvipforward.cpp

@@ -47,6 +47,8 @@ void FMVipForward::parseRequest(const QJsonObject &jsonObj)
         pay(jsonObj, fm_jsonObj);
     } else if(type == Type_Final) {
         final(jsonObj, fm_jsonObj);
+    } else if(type == Type_Order_Refund || type == Type_Order_Revoke) {
+        revoke(jsonObj, fm_jsonObj);
     }
 
     _reqType = fm_jsonObj["reqType"].toInt();
@@ -78,6 +80,8 @@ void FMVipForward::request(const QJsonObject &reqJob)
 
     // 设置URL
     QString signStr = sign(reqJob);
+
+    qDebug() << "sign ===>" << signStr;
     _req.setUrl(_urlStr.arg(signStr));
 
     QJsonDocument json(reqJob);
@@ -210,10 +214,10 @@ void FMVipForward::final(const QJsonObject &job, QJsonObject &fmjob)
     foreach (QJsonValue pay_v , pay_ids)
     {
         QJsonObject pay_ob = pay_v.toObject();
-        if(pay_ob["pay_id"] == "001") {
+        if(pay_ob["pay_id"] == "24") {
             codeAmount = pay_ob["paid_total_amount"].toInt();
         }
-        if(pay_ob["pay_id"] == "003") {
+        if(pay_ob["pay_id"] == "25") {
             scoreAmount = pay_ob["paid_total_amount"].toInt();
             couponArray = pay_ob["coupons"].toArray();
         }
@@ -245,6 +249,16 @@ void FMVipForward::final(const QJsonObject &job, QJsonObject &fmjob)
     fmjob["transaction"] = transObj;
 }
 
+void FMVipForward::revoke(const QJsonObject &job, QJsonObject &fmjob)
+{
+    fmjob["reqType"] = FM_VIP_REVOKE;
+    if(job.contains("trans_id") && job["trans_id"].isArray()) {
+        fmjob["transId"] = job["trans_id"];
+    }
+    QJsonObject transObj;
+    transObj["memberTransId"] = job["fm_id"];
+    fmjob["transaction"] = transObj;
+}
 
 void FMVipForward::logined(const QJsonObject &serverJob, QJsonObject &posJob)
 {
@@ -318,6 +332,11 @@ void FMVipForward::finaled(const QJsonObject &serverJob, QJsonObject &posJob)
     posJob["print"] = "";
 }
 
+void FMVipForward::revoked(const QJsonObject &serverJob, QJsonObject &posJob)
+{
+    posJob["fm_id"] = serverJob["memberTransId"];
+}
+
 QString FMVipForward::sign(const QJsonObject &reqJob) const
 {
     // 解析JSON插入MAP中按字典排序
@@ -340,6 +359,8 @@ QString FMVipForward::sign(const QJsonObject &reqJob) const
 
     sb.append(KeyCode);
 
+    qDebug() << "签名字符串 ===> " << sb;
+
     QByteArray bt;
     bt.append(sb);
 

FMVip/fmvipforward.h

@@ -17,6 +17,9 @@
 #define Type_Pay        "order_request"
 #define Type_Fund       "member_charge_rquest"
 #define Type_Final      "Integral_request"
+#define Type_Order_Refund   "order_refund_request"
+#define Type_Fund_Refund    "charge_refund_rquest"
+#define Type_Order_Revoke   "order_revoke_request"
 
 #define FM_VIP_LOGIN    1001
 #define FM_VIP_FUND     1002
@@ -53,12 +56,14 @@ private:
     void coupon(const QJsonObject &job, QJsonObject &fmjob);
     void pay(const QJsonObject &job, QJsonObject &fmjob);
     void final(const QJsonObject &job, QJsonObject &fmjob);
+    void revoke(const QJsonObject &job, QJsonObject &fmjob);
 
     void logined(const QJsonObject &serverJob, QJsonObject &posJob);
     void funded(const QJsonObject &serverJob, QJsonObject &posJob);
     void couponed(const QJsonObject &serverJob, QJsonObject &posJob);
     void payed(const QJsonObject &serverJob, QJsonObject &posJob);
     void finaled(const QJsonObject &serverJob, QJsonObject &posJob);
+    void revoked(const QJsonObject &serverJob, QJsonObject &posJob);
 
     void request(const QJsonObject &reqJob);