1

lewaimai_pos_windows/network/CMqttClient.cpp

@@ -204,8 +204,6 @@ void CMqttClient::on_success(const mqtt::token& tok)
 	if (m_is_mqtt_connected == false)
 	{
 		//连接成功了，再connected里面处理
-		
-		int a = 1;
 	}
 	else
 	{

lewaimai_pos_windows/network/CMqttClient.h

@@ -36,7 +36,7 @@ class CMqttClient : public virtual mqtt::callback,
 {
 private:
     //¶¨ÒåһЩ³£Á¿
-    std::string m_server_address = "post-cn-x0r3kjlsy02.mqtt.aliyuncs.com";
+    std::string m_server_address = "mqttserver.lewaimai.com";
 	std::string m_instanceId = "post-cn-x0r3kjlsy02";
     std::string m_topic = "lewaimai_windows_pos";
 	std::string m_accessKey = "LTAI4G5oikJPMfhq5PuW26qu";

lewaimai_pos_windows/order/CWaimaiOrder.cpp

@@ -53,65 +53,58 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 			//获得数据成功
 			rapidjson::Value& data = document["data"];
 
-			m_order_id = data["id"].GetString();
-			m_shop_id = data["shop_id"].GetString();
-			m_restaurant_number = data["restaurant_number"].GetString();
-			m_customer_id = data["customer_id"].GetString();
-			m_customer_name = data["customer_name"].GetString();
-			m_phone = data["phone"].GetString();
-			m_address = data["address"].GetString();
-			m_memo = data["memo"].GetString();
-			m_pay_type = data["pay_type"].GetString();
-			m_promotion = data["promotion"].GetString();
-			m_is_member_discount = data["is_member_discount"].GetString();
-			m_member_discount = data["member_discount"].GetString();
-			m_discount = atof(data["discount"].GetString());
-			m_coupon = atof(data["coupon"].GetString());
-			m_delivery = atof(data["delivery"].GetString());
-			m_price = atof(data["price"].GetString());
-			m_order_date = data["order_date"].GetString();
-			m_order_status = data["order_status"].GetString();
-			m_courier_id = data["courier_id"].GetString();
-			m_is_selftake = data["is_selftake"].GetString();
-			m_delivery_mode = data["delivery_mode"].GetString();
-			m_is_dabao = data["is_dabao"].GetString();
-			m_dabao_money = data["dabao_money"].GetString();
-			//m_phone_customer_id = data["phone_customer_id"].GetString();
-			m_order_num = data["order_num"].GetString();
-			m_from_type = data["from_type"].GetString();
-			m_is_refund = data["is_refund"].GetString();
-			m_refund_status = data["refund_status"].GetString();
-			m_is_pickup = data["is_pickup"].GetString();
-			m_pickup_time = data["pickup_time"].GetString();
-			//m_verify_time = data["verify_time"].GetString();
-			//m_verify_user = data["verify_user"].GetString();
-			m_refund_failed_reason = data["refund_failed_reason"].GetString();
-			m_refund_time = data["refund_time"].GetString();
-			m_failed_reason = data["failed_reason"].GetString();
-			m_configmemo = data["configmemo"].GetString();
-			//m_courier_type = data["courier_type"].GetString();
-			m_courier_name = data["courier_name"].GetString();
-			m_courier_phone = data["courier_phone"].GetString();
-			//m_receiver_lng = data["receiver_lng"].GetString();
-			//m_receiver_lat = data["receiver_lat"].GetString();
-			//m_discount_price = data["discount_price"].GetString();
-			m_order_no = data["order_no"].GetString();
-			m_is_firstcut = data["is_firstcut"].GetString();
-			m_firstcut_value = data["firstcut_value"].GetString();
-			m_need_to_refund = data["need_to_refund"].GetString();
-
-			m_shop_name = data["shop_name"].GetString();
-			m_longitude = data["longitude"].GetString();
-			m_latitude = data["latitude"].GetString();
-			m_open_selftake = data["open_selftake"].GetString();
-			m_delivery_date = data["delivery_date"].GetString();
-
-			m_showordernum = data["showordernum"].GetString();
-			m_customer_order_total = data["customer_order_total"].GetString();
-
-			m_printer_tip_name = data["printer_tip_name"].GetString();
-
-			m_is_book = data["is_book"].GetString();
+			m_order_id = CLewaimaiJson::ToString(data["id"]);
+			m_shop_id =  CLewaimaiJson::ToString(data["shop_id"]);
+			m_restaurant_number =  CLewaimaiJson::ToString(data["restaurant_number"]);
+			m_customer_id =  CLewaimaiJson::ToString(data["customer_id"]);
+			m_customer_name = CLewaimaiJson::ToString(data["customer_name"]);
+			m_phone =  CLewaimaiJson::ToString(data["phone"]);
+			m_address = CLewaimaiJson::ToString(data["address"]);
+			m_memo = CLewaimaiJson::ToString(data["memo"]);
+			m_pay_type = CLewaimaiJson::ToString(data["pay_type"]);
+			m_promotion = CLewaimaiJson::ToString(data["promotion"]);
+			m_is_member_discount = CLewaimaiJson::ToString(data["is_member_discount"]);
+			m_member_discount = CLewaimaiJson::ToString(data["member_discount"]);
+			m_discount = atof(CLewaimaiJson::ToString(data["discount"]).c_str());
+			m_coupon = atof(CLewaimaiJson::ToString(data["coupon"]).c_str());
+			m_delivery = atof(CLewaimaiJson::ToString(data["delivery"]).c_str());
+			m_price = atof(CLewaimaiJson::ToString(data["price"]).c_str());
+			m_order_date =  CLewaimaiJson::ToString(data["order_date"]);
+			m_order_status = CLewaimaiJson::ToString(data["order_status"]);
+			m_courier_id =  CLewaimaiJson::ToString(data["courier_id"]);
+			m_is_selftake = CLewaimaiJson::ToString(data["is_selftake"]);
+			m_delivery_mode = CLewaimaiJson::ToString(data["delivery_mode"]);
+			m_is_dabao = CLewaimaiJson::ToString(data["is_dabao"]);
+			m_dabao_money = CLewaimaiJson::ToString(data["dabao_money"]);
+			m_order_num = CLewaimaiJson::ToString(data["order_num"]);
+			m_from_type = CLewaimaiJson::ToString(data["from_type"]);
+			m_is_refund =  CLewaimaiJson::ToString(data["is_refund"]);
+			m_refund_status = CLewaimaiJson::ToString(data["refund_status"]);
+			m_is_pickup = CLewaimaiJson::ToString(data["is_pickup"]);
+			m_pickup_time = CLewaimaiJson::ToString(data["pickup_time"]);
+			m_refund_failed_reason = CLewaimaiJson::ToString(data["refund_failed_reason"]);
+			m_refund_time =  CLewaimaiJson::ToString(data["refund_time"]);
+			m_failed_reason = CLewaimaiJson::ToString(data["failed_reason"]);
+			m_configmemo = CLewaimaiJson::ToString(data["configmemo"]);
+			m_courier_name = CLewaimaiJson::ToString(data["courier_name"]);
+			m_courier_phone = CLewaimaiJson::ToString(data["courier_phone"]);
+			m_order_no = CLewaimaiJson::ToString(data["order_no"]);
+			m_is_firstcut = CLewaimaiJson::ToString(data["is_firstcut"]);
+			m_firstcut_value = CLewaimaiJson::ToString(data["firstcut_value"]);
+			m_need_to_refund = CLewaimaiJson::ToString(data["need_to_refund"]);
+
+			m_shop_name = CLewaimaiJson::ToString(data["shop_name"]);
+			m_longitude = CLewaimaiJson::ToString(data["longitude"]);
+			m_latitude = CLewaimaiJson::ToString(data["latitude"]);
+			m_open_selftake = CLewaimaiJson::ToString(data["open_selftake"]);
+			m_delivery_date = CLewaimaiJson::ToString(data["delivery_date"]);
+
+			m_showordernum = CLewaimaiJson::ToString(data["showordernum"]);
+			m_customer_order_total = CLewaimaiJson::ToString(data["customer_order_total"]);
+
+			m_printer_tip_name = CLewaimaiJson::ToString(data["printer_tip_name"]);
+
+			m_is_book = CLewaimaiJson::ToString(data["is_book"]);
 
 			//开始保存订单详情
 			rapidjson::Value& v_rows = data["order_item"];
@@ -121,12 +114,12 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 				rapidjson::Value& v_row_i = v_rows[i];
 
 				CWaimaiOrderItem newItem;
-				newItem.m_food_name = v_row_i["food_name"].GetString();
-				newItem.m_item_price = v_row_i["item_price"].GetString();
-				newItem.m_quantity = v_row_i["quantity"].GetString();
-				newItem.m_type_id = v_row_i["type_id"].GetString();
-				newItem.m_foodpackage_id = v_row_i["foodpackage_id"].GetString();
-				newItem.m_is_foodpackage = v_row_i["is_foodpackage"].GetString();
+				newItem.m_food_name =  CLewaimaiJson::ToString(v_row_i["food_name"]);
+				newItem.m_item_price = CLewaimaiJson::ToString(v_row_i["item_price"]);
+				newItem.m_quantity = CLewaimaiJson::ToString(v_row_i["quantity"]);
+				newItem.m_type_id = CLewaimaiJson::ToString(v_row_i["type_id"]);
+				newItem.m_foodpackage_id = CLewaimaiJson::ToString(v_row_i["foodpackage_id"]);
+				newItem.m_is_foodpackage = CLewaimaiJson::ToString(v_row_i["is_foodpackage"]);
 
 				m_order_items.push_back(newItem);
 			}
@@ -139,8 +132,8 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 				rapidjson::Value& v_row_i = v_rows[i];
 
 				CWaimaiOrderField newItem;
-				newItem.name = v_row_i["name"].GetString();
-				newItem.value = v_row_i["value"].GetString();
+				newItem.name = CLewaimaiJson::ToString(v_row_i["name"]);
+				newItem.value = CLewaimaiJson::ToString(v_row_i["value"]);
 
 				m_order_field.push_back(newItem);
 			}
@@ -153,24 +146,24 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 				rapidjson::Value& v_row_i = v_rows[i];
 
 				CWaimaiOrderField newItem;
-				newItem.name = v_row_i["name"].GetString();
-				newItem.value = v_row_i["value"].GetString();
+				newItem.name = CLewaimaiJson::ToString(v_row_i["name"]);
+				newItem.value = CLewaimaiJson::ToString(v_row_i["value"]);
 
 				m_addservie.push_back(newItem);
 			}
 
-			m_show_qiangdan_qrcode = data["show_qiangdan_qrcode"].GetString();
+			m_show_qiangdan_qrcode = CLewaimaiJson::ToString(data["show_qiangdan_qrcode"]);
 
-			m_manzeng_name = data["manzeng_name"].GetString();
+			m_manzeng_name = CLewaimaiJson::ToString(data["manzeng_name"]);
 
-			m_show_whole_phone = data["show_whole_phone"].GetString();
+			m_show_whole_phone = CLewaimaiJson::ToString(data["show_whole_phone"]);
 
-			m_is_apply_refund = data["is_apply_refund"].GetString();
+			m_is_apply_refund = CLewaimaiJson::ToString(data["is_apply_refund"]);
 
 			if (m_is_apply_refund == "1")
 			{
-				m_refund_reason_first = data["refundInfo"]["first_refund_reason"].GetString();
-				m_refund_info_status = data["refundInfo"]["refund_status"].GetString();
+				m_refund_reason_first = CLewaimaiJson::ToString(data["refundInfo"]["first_refund_reason"]);
+				m_refund_info_status = CLewaimaiJson::ToString(data["refundInfo"]["refund_status"]);
 			}
 		}
 	}
@@ -215,7 +208,7 @@ bool CWaimaiOrder::ConfirmeOrder(std::string order_id)
 	//获得数据成功
 	rapidjson::Value& data = document["data"];
 	rapidjson::Value& v_count = data["count"];
-	string count = v_count.GetString();
+	string count = CLewaimaiJson::ToString(v_count);
 
 	return true;
 }
@@ -257,7 +250,7 @@ bool CWaimaiOrder::SuccessOrder(std::string order_id)
 	//获得数据成功
 	rapidjson::Value& data = document["data"];
 	rapidjson::Value& v_count = data["count"];
-	string count = v_count.GetString();
+	string count = CLewaimaiJson::ToString(v_count);
 
 	return true;
 }
@@ -300,7 +293,7 @@ bool CWaimaiOrder::FailOrder(std::string order_id, std::string reason)
 	//获得数据成功
 	rapidjson::Value& data = document["data"];
 	rapidjson::Value& v_count = data["count"];
-	string count = v_count.GetString();
+	string count = CLewaimaiJson::ToString(v_count);
 
 	return true;
 }
@@ -422,7 +415,7 @@ bool CWaimaiOrder::Refund(std::string order_id)
 	//获得数据成功
 	rapidjson::Value& data = document["data"];
 	
-	order_id = data["order_id"].GetString();
+	order_id = CLewaimaiJson::ToString(data["order_id"]);
 
 	return true;
 }