添加卡券支付

fmvip/fmvipdispatcher.cpp

@@ -18,7 +18,7 @@
 #include <ctkPluginContext.h>
 #undef StartService
 #include <fmp_epay_i.h>
-
+#include "fmp_redeem_i.h"
 
 FMVipDispatcher::FMVipDispatcher(QObject *parent) :
     QObject(parent),
@@ -81,6 +81,23 @@ void FMVipDispatcher::doTask(const QByteArray &reqData, QByteArray &rspData)
         }
         break;
     }
+    case FM_Coupon_Pay:{
+        if(_ctx){
+            ctkServiceReference ref = _ctx->getServiceReference<FMPRedeemInterface>();
+            FMPRedeemInterface* redeem = _ctx->getService<FMPRedeemInterface>(ref);
+            //for test
+//            jsonObj["store_id"] = "fm99999";
+//            jsonObj["pos_id"] = "01";
+//            jsonObj["operator_id"] = "00000002";
+//            jsonObj["partner_id"] = 1371;
+            QJsonObject result = redeem->Redeem(jsonObj);
+            rspData = QJsonDocument(result).toJson(QJsonDocument::Compact);
+        }
+        else{
+            rspData = QString::fromLocal8Bit("{\"msg:\":\"卡券服务不可用\"}").toUtf8();
+        }
+        break;
+    }
     case FM_Refund: {
         TaskRefund taskRefund(jsonObj);
         rspData = taskRefund.doTask();

fmvip/global.h

@@ -33,6 +33,7 @@ enum FM_TYPE {
     FM_Coupon = 1009,
     FM_Order_Revoke,
     FM_QR_Pay = 10031,
+    FM_Coupon_Pay,
     FM_QR_Refund = 10041,
     FM_Refund_Pay,
     FM_Refund_Order
@@ -280,20 +281,21 @@ const PropsMap::value_type PropsMapPairs[] =
 };
 static PropsMap PosToServerProps(PropsMapPairs, PropsMapPairs + (sizeof(PropsMapPairs)/sizeof(PropsMapPairs[0])));
 
-class FMPropsMap
-{
-public:
-    static QString get(QString posProp) {
-        PropsMap::iterator it = PosToServerProps.find(posProp);
-        if(it != PosToServerProps.end()) {
-            return it->second;
-        }
-        return posProp;
-    }
-};
+//class FMPropsMap
+//{
+//public:
+//    static QString get(QString posProp) {
+//        PropsMap::iterator it = PosToServerProps.find(posProp);
+//        if(it != PosToServerProps.end()) {
+//            return it->second;
+//        }    
+//        return posProp;
+//    }
+//};
 #endif
 
-#define ServerProps(posProp) FMPropsMap::get(posProp)
+//#define ServerProps(posProp) FMPropsMap::get(posProp)
+#define ServerProps(posProp) PosToServerProps.find(posProp) == PosToServerProps.end() ? posProp : PosToServerProps[posProp]
 
 // 签名字段
 const static QString SignProps[] = {