增加券id字段

base/CommonStruct.h

@@ -134,6 +134,7 @@ struct promotions
     std::string desc;                //优惠明细
     std::string name;                //名称
     std::string sku;                 //商品编号
+    std::string couponId;            //券id
     int originalPrice=0;             //原始价格
     int discount=0;                  //折扣
     int promotionPrice=0;             //优惠价格

src/JsonModule.cpp

@@ -384,6 +384,7 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
                                 detail.proType = GetJsonStringSafe(promtionDetails_obj,"type");
                                 detail.desc = GetJsonStringSafe(promtionDetails_obj,"desc");                                
                                 detail.sku = GetJsonStringSafe(promtionDetails_obj,"sku");
+                                detail.couponId = GetJsonStringSafe(promtionDetails_obj, "couponId");
                                 detail.originalPrice = GetJsonIntSafe(promtionDetails_obj,"originalPrice");
                                 detail.promotionPrice = GetJsonIntSafe(promtionDetails_obj,"promotionPrice");
                                 detail.discount = GetJsonIntSafe(promtionDetails_obj,"discount");
@@ -1367,6 +1368,9 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
         writer.Key("giftQty");
         writer.Int(obj.vecPromotions[i].giftQty);
 
+        writer.Key("couponId");
+        writer.String(obj.vecPromotions[i].couponId.c_str());
+
         writer.EndObject();
     }
     writer.EndArray();

src/main.cpp

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