New Feature: 新增2字段：1、纳客宝基本积分；2、纳客宝额外积分

 Version: 1.2.0 RC
‘

base/CommonStruct.h

@@ -223,6 +223,9 @@ struct orderObj
     std::string order_drift;                          //订单漂移
     int bonus_basic = 0;                              //基本积分
     int bonus_extra = 0;                              //额外积分
+    int bonus_basic_nkb = 0;                      //纳客宝-基本积分
+    int bonus_extra_nkb = 0;                      //纳客宝-额外积分
+
     int bonus_total = 0;                              // 获得总积分 
     int totalCouponDiscount = 0;                      //使用优惠券发生的折扣
     int totalExcessiveCharge = 0;                     //使用优惠券发生的溢收

src/JsonModule.cpp

@@ -411,6 +411,8 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
                     order.bonus_total = GetJsonIntSafe(points_obj,"totalPoint");
                     order.bonus_extra = GetJsonIntSafe(points_obj, "extraPoint");
                     order.bonus_basic = GetJsonIntSafe(points_obj, "basicPoint");
+                    order.bonus_extra_nkb = GetJsonIntSafe(points_obj, "nkbExtraPoint");
+                    order.bonus_basic_nkb = GetJsonIntSafe(points_obj, "nkbBasicPoint");
                     order.zhxPoint = GetJsonIntSafe(points_obj, "zhxPoint");
                     //积分信息详情
                     if(points_obj.HasMember("pointDetails"))
@@ -1287,10 +1289,14 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
     //----------------消费积分----------------
     writer.Key("bonusBasic");
     writer.Int(obj.bonus_basic);
-
     writer.Key("bonusExtra");
     writer.Int(obj.bonus_extra);
 
+    writer.Key("nkbBonusBasic");
+    writer.Int(obj.bonus_basic_nkb);
+    writer.Key("nkbBonusExtra");
+    writer.Int(obj.bonus_extra_nkb);
+
     writer.Key("bonusTotal");
     writer.Int(obj.bonus_total);
 

src/main.cpp

@@ -19,7 +19,7 @@
 
 INITIALIZE_EASYLOGGINGPP
 
-#define VERSION         "1.1.0 beta2"     //版本号
+#define VERSION         "1.2.0 RC"     //版本号
 
 std::string g_init_data;
 std::string g_init_data_ods_back;