Commit f7536466 by guanghui.cui

接口会员帐号字段

parent 31862199
...@@ -318,6 +318,14 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order) ...@@ -318,6 +318,14 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
rapidjson::Value& transNum = payInfos_obj["transNum"]; rapidjson::Value& transNum = payInfos_obj["transNum"];
detail.trans_id = transNum.GetString(); detail.trans_id = transNum.GetString();
if(payInfos_obj.HasMember("accountId")){
rapidjson::Value& accountId = payInfos_obj["accountId"];
if(!accountId.IsNull()){
detail.account_id=accountId.GetString();
}
}
order.payInfo.vecDetail.push_back(detail); order.payInfo.vecDetail.push_back(detail);
} }
} }
......
...@@ -84,7 +84,8 @@ void* listen_pos_func(void* arg) ...@@ -84,7 +84,8 @@ void* listen_pos_func(void* arg)
if( jsonTool.checkInitData(posRequestData, pos_listen_port) ) if( jsonTool.checkInitData(posRequestData, pos_listen_port) )
{ {
g_init_data_ods_back.clear(); g_init_data_ods_back.clear();
//g_init_data = posRequestData; // g_init_data = posRequestData;
LOG(INFO) <<"POS req data.:"<<posRequestData.c_str();
jsonTool.convertInitDataPos2Ods(posRequestData,g_init_data); jsonTool.convertInitDataPos2Ods(posRequestData,g_init_data);
//jsonTool.getPosResponseData(100, "successful!", responseData); //jsonTool.getPosResponseData(100, "successful!", responseData);
LOG(INFO) <<"POS init data.:"<<g_init_data.c_str(); LOG(INFO) <<"POS init data.:"<<g_init_data.c_str();
...@@ -307,11 +308,16 @@ int main() ...@@ -307,11 +308,16 @@ int main()
LOG(INFO)<<"ODS init back:"<<odsPushData.data(); LOG(INFO)<<"ODS init back:"<<odsPushData.data();
while(!bInitDone){ while(!bInitDone){
LOG(INFO)<<"wait for init done"; LOG(INFO)<<"wait for init done";
if( !ods.isValid() ){
LOG(INFO)<<"ods is not valid";
break;
}
sleep(1); sleep(1);
} }
//检测是否有发送失败的订单,如果有的话,启动线程,先发送原先失败的订单 //检测是否有发送失败的订单,如果有的话,启动线程,先发送原先失败的订单
sqlite.query("select * from fmOrderFailed",vecFailedOrders); sqlite.query("select * from fmOrderFailed",vecFailedOrders);
LOG(INFO)<<"vecFailedOrders size:"<<vecFailedOrders.size();
if(vecFailedOrders.size()>0){ if(vecFailedOrders.size()>0){
pthread_t retry_thread_id; pthread_t retry_thread_id;
if(pthread_create(&retry_thread_id,NULL,retry_send_pos_func,NULL)) if(pthread_create(&retry_thread_id,NULL,retry_send_pos_func,NULL))
......
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