Skip to content

F
familyMart_takeaway
Commit 34955e4b by guanghui.cui
Options

空格替换tab(为了在linux查看代码对齐)

parent 5615efd4
Showing with 90 additions and 90 deletions
src/JsonModule.cpp
......@@ -96,78 +96,78 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
{
rapidjson::Value& delivery_obj = document["delivery"];
if(delivery_obj.IsObject())
{
if(delivery_obj.HasMember("customerAddress"))
{
rapidjson::Value& customerAddress = delivery_obj["customerAddress"];
order.customerInfo.address=customerAddress.GetString();
}
if(delivery_obj.HasMember("customerName"))
{
rapidjson::Value& customerName = delivery_obj["customerName"];
order.customerInfo.name = customerName.GetString();
}
if(delivery_obj.HasMember("customerPhone"))
{
rapidjson::Value& customerPhone = delivery_obj["customerPhone"];
order.customerInfo.phone = customerPhone.GetString();
}
if(delivery_obj.HasMember("deliveryTime"))
{
rapidjson::Value& deliveryTime = delivery_obj["deliveryTime"];
order.delivery_time = deliveryTime.GetString();
}
if(delivery_obj.HasMember("name"))
{
rapidjson::Value& name = delivery_obj["name"];
order.deliveryInfo.driver_name = name.GetString();
}
if(delivery_obj.HasMember("phone"))
{
rapidjson::Value& phone = delivery_obj["phone"];
order.deliveryInfo.driver_phone = phone.GetString();
}
if(delivery_obj.HasMember("type"))
{
rapidjson::Value& type = delivery_obj["type"];
order.deliveryInfo.type = type.GetString();
}
}
if(delivery_obj.IsObject())
{
if(delivery_obj.HasMember("customerAddress"))
{
rapidjson::Value& customerAddress = delivery_obj["customerAddress"];
order.customerInfo.address=customerAddress.GetString();
}
if(delivery_obj.HasMember("customerName"))
{
rapidjson::Value& customerName = delivery_obj["customerName"];
order.customerInfo.name = customerName.GetString();
}
if(delivery_obj.HasMember("customerPhone"))
{
rapidjson::Value& customerPhone = delivery_obj["customerPhone"];
order.customerInfo.phone = customerPhone.GetString();
}
if(delivery_obj.HasMember("deliveryTime"))
{
rapidjson::Value& deliveryTime = delivery_obj["deliveryTime"];
order.delivery_time = deliveryTime.GetString();
}
if(delivery_obj.HasMember("name"))
{
rapidjson::Value& name = delivery_obj["name"];
order.deliveryInfo.driver_name = name.GetString();
}
if(delivery_obj.HasMember("phone"))
{
rapidjson::Value& phone = delivery_obj["phone"];
order.deliveryInfo.driver_phone = phone.GetString();
}
if(delivery_obj.HasMember("type"))
{
rapidjson::Value& type = delivery_obj["type"];
order.deliveryInfo.type = type.GetString();
}
}
}
//发票信息
{
rapidjson::Value& invoice_obj = document["invoice"];
if(invoice_obj.IsObject())
{
if(invoice_obj.HasMember("companyName"))
{
rapidjson::Value& companyName = invoice_obj["companyName"];
companyName.GetString();
}
if(invoice_obj.HasMember("invoiceType"))
{
rapidjson::Value& invoiceType = invoice_obj["invoiceType"];
invoiceType.GetInt();
}
if(invoice_obj.HasMember("taxNum"))
{
rapidjson::Value& taxNum = invoice_obj["taxNum"];
taxNum.GetString();
}
if(invoice_obj.HasMember("title"))
{
rapidjson::Value& title = invoice_obj["title"];
title.GetString();
}
if(invoice_obj.HasMember("transNum"))
{
rapidjson::Value& transNum = invoice_obj["transNum"];
transNum.GetString();
}
}
if(invoice_obj.IsObject())
{
if(invoice_obj.HasMember("companyName"))
{
rapidjson::Value& companyName = invoice_obj["companyName"];
companyName.GetString();
}
if(invoice_obj.HasMember("invoiceType"))
{
rapidjson::Value& invoiceType = invoice_obj["invoiceType"];
invoiceType.GetInt();
}
if(invoice_obj.HasMember("taxNum"))
{
rapidjson::Value& taxNum = invoice_obj["taxNum"];
taxNum.GetString();
}
if(invoice_obj.HasMember("title"))
{
rapidjson::Value& title = invoice_obj["title"];
title.GetString();
}
if(invoice_obj.HasMember("transNum"))
{
rapidjson::Value& transNum = invoice_obj["transNum"];
transNum.GetString();
}
}
}
//订单内容
{
......@@ -419,20 +419,20 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
//第三方商户信息
{
rapidjson::Value& sellerInfo_obj = document["sellerInfo"];
if(sellerInfo_obj.IsObject())
{
if(sellerInfo_obj.HasMember("sellerId"))
{
rapidjson::Value& sellerId = sellerInfo_obj["sellerId"];
sellerId.GetString();
}
if(sellerInfo_obj.HasMember("sellerName"))
{
rapidjson::Value& sellerName = sellerInfo_obj["sellerName"];
sellerName.GetString();
}
}
if(sellerInfo_obj.IsObject())
{
if(sellerInfo_obj.HasMember("sellerId"))
{
rapidjson::Value& sellerId = sellerInfo_obj["sellerId"];
sellerId.GetString();
}
if(sellerInfo_obj.HasMember("sellerName"))
{
rapidjson::Value& sellerName = sellerInfo_obj["sellerName"];
sellerName.GetString();
}
}
}
//门店信息
{
......@@ -626,12 +626,12 @@ bool JsonModule::convertDataOds2Pos(const std::string &data, std::string &result
bool rlt=true;
orderObj order;
rlt = getPushOrders(data.c_str(),order);
if(rlt)
{
result = _convertToNewOrderJson(order);
}
if(rlt)
{
result = _convertToNewOrderJson(order);
}
return rlt;
}
......@@ -835,8 +835,8 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
writer.Key("trans_id");
writer.String(obj.payInfo.vecDetail[i].trans_id.c_str());
writer.Key("account_id");
writer.Key("account_id");
writer.String(obj.payInfo.vecDetail[i].account_id.c_str());
writer.EndObject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment