Commit cd47f584 by guanghui.cui

字段错误修复

parent bdac79cb
......@@ -596,20 +596,21 @@ bool JsonModule::getOdsResponseData(const std::string &posResponse, const std::s
return false;
}
if( !document.HasMember("fm_cmd") )
if( !document1.HasMember("fm_cmd") )
{
LOG(INFO)<<"Don't have needed parames";
LOG(INFO)<<"Don't have needed parames.";
return false;
}
int fm_cmd = document["fm_cmd"].GetInt();
int fm_cmd = document1["fm_cmd"].GetInt();
LOG(INFO)<<"fm_cmd:"<<fm_cmd;
bool rlt=false;
if(fm_cmd==REQUEST_TYPE_NEWORDER_PUSH){
rlt=_getOrderResponseJson(posResponse,orderData,result);
}
else if(fm_cmd==REQUEST_TYPE_STOCK_WARN){
rlt=_getStockWarnResponseJson(posResponse,orderData,result);
}
// else if(fm_cmd==REQUEST_TYPE_STOCK_WARN){
// rlt=_getStockWarnResponseJson(posResponse,orderData,result);
// }
return rlt;
}
......
......@@ -221,7 +221,7 @@ int main()
if( ods.receive(odsPushData) )
{
LOG(INFO) << "----------------recved ODS data------------------";
LOG(INFO) << "----------------recved ODS data------------------.";
LOG(INFO) << odsPushData;
if(!jsonTool.isHeartbeatData(odsPushData.data())){
if( jsonTool.convertDataOds2Pos(odsPushData, pushPosData) )
......@@ -239,11 +239,11 @@ int main()
LOG(INFO) << "pos response data:"<<tmpBuf;
std::string tmp(tmpBuf);
//pos发送过来的数据为gb2312编码,需要转换为utf8
std::string tmpUtf8= charset_g2u(tmp);
LOG(INFO)<<"gb2312 to utf8:"<<tmpUtf8.data();
jsonTool.getOdsResponseData(tmpUtf8, pushPosData, responseData);
//std::string tmpUtf8= charset_g2u(tmp);
//LOG(INFO)<<"gb2312 to utf8:"<<tmpUtf8.data();
//jsonTool.getOdsResponseData(tmpUtf8, pushPosData, responseData);
//jsonTool.getOdsResponseData(tmp, odsPushData, responseData);
jsonTool.getOdsResponseData(tmp, pushPosData, responseData);
}else
{
jsonTool.getOdsResponseData(101, "receive data from [POS] failed!", responseData);
......
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