1

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -2665,6 +2665,7 @@ void CZhengcanDiandanPageUI::ClickXidanBtn()
 	params["persion_num"] = "1";
 	params["note"] = m_cur_diandan_order.GetMemo();
 	params["table_id"] = m_table_id;
+	params["table_name"] = m_table_name;
 
 	std::string response;
 

zhipuzi_pos_windows/zhipuzi/CZhengcanOrder.cpp

@@ -571,6 +571,8 @@ bool CZhengcanOrder::InitData(std::string order_id)
 	//获得数据成功
 	rapidjson::Value& data = document["data"];
 
+	shopname = CShopinfo::GetInstance()->m_shop_name;
+
 	m_order_id = data["id"].GetString();
 	show_trade_no = data["show_trade_no"].GetString();
 	m_renshu = data["person_num"].GetString();
@@ -610,26 +612,26 @@ bool CZhengcanOrder::InitData(std::string order_id)
 	}
 	
 	is_refund = data["is_refund"].GetString();
-	refund_time = data["refund_time"].GetString();
+	refund_time = CLewaimaiJson::ToString(data["refund_time"]);
 
-	m_total_member_youhui = data["member_delete"].GetString();
+	m_total_member_youhui = CLewaimaiJson::ToString(data["member_delete"]);
 
-	init_time = data["init_time"].GetString();
+	init_time = CLewaimaiJson::ToString(data["init_time"]);
 
-	m_is_clear = data["is_clear"].GetString();
+	m_is_clear = CLewaimaiJson::ToString(data["is_clear"]);
 	
 	
-	m_kaitai_time = data["kaitai_time"].GetString();
-	m_pay_time = data["pay_time"].GetString();
+	m_kaitai_time = CLewaimaiJson::ToString(data["kaitai_time"]);
+	m_pay_time = CLewaimaiJson::ToString(data["pay_time"]);
 
-	m_youhuiquan_youhui = data["coupon_value"].GetString();
+	m_youhuiquan_youhui = CLewaimaiJson::ToString(data["coupon_value"]);
 
-	m_manjian_youhui = data["promotion_value"].GetString();	
+	m_manjian_youhui = CLewaimaiJson::ToString(data["promotion_value"]);
 	
-	m_member_zhekou_youhui = data["member_discount_money"].GetString();
-	m_zhekou_youhui = data["shop_discount_money"].GetString();
-	m_cika_youhui = data["timescoupon_discount_money"].GetString();
-	m_quanyika_youhui = data["eq_card_discount_money"].GetString();	
+	m_member_zhekou_youhui = CLewaimaiJson::ToString(data["member_discount_money"]);
+	m_zhekou_youhui = CLewaimaiJson::ToString(data["shop_discount_money"]);
+	m_cika_youhui = CLewaimaiJson::ToString(data["timescoupon_discount_money"]);
+	m_quanyika_youhui = CLewaimaiJson::ToString(data["eq_card_discount_money"]);
 
 	//开始保存订单详情
 	rapidjson::Value& v_rows = data["item"];