暂时先把下单跑通了

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -2232,6 +2232,25 @@ void CZhengcanDiandanPageUI::ClickXidanBtn()
 		return;
 	}
 
+	//对各个CZhengcanOrderItem的is_jaicai进行处理
+	bool is_jiacai = false;
+	if (m_cur_diandan_order.m_order_history_array.size() > 0)
+	{
+		is_jiacai = true;
+	}
+
+	for (std::vector<CZhengcanOrderItem>::iterator it = m_cur_diandan_order.m_items.begin(); it != m_cur_diandan_order.m_items.end(); it++)
+	{
+		if (is_jiacai)
+		{
+			it->is_jiacai = "1";
+		}
+		else
+		{
+			it->is_jiacai = "0";
+		}
+	}
+
 	//处理下单加菜逻辑
 	std::map<string, string> params;
 

zhipuzi_pos_windows/zhipuzi/CZhengcanOrder.cpp

@@ -353,19 +353,7 @@ std::string CZhengcanOrder::getDiandanFoodlistParam()
 			continue;
 		}
 
-		std::map<string, string> itemParam = it->getDiandanParam();
-
-		itemParam["is_tuicai"] = "0";
-
-		if (m_order_history_array.size() == 0)
-		{
-			//Ê×µ¥
-			itemParam["is_jiacai"] = "0";
-		}
-		else
-		{
-			itemParam["is_jiacai"] = "1";
-		}		
+		std::map<string, string> itemParam = it->getDiandanParam();	
 
 		params.push_back(itemParam);
 	}

zhipuzi_pos_windows/zhipuzi/CZhengcanOrderItem.cpp

@@ -338,6 +338,9 @@ std::map<string, string> CZhengcanOrderItem::getDiandanParam()
 	param["type_id"] = m_foodinfo.type_id;
 	param["foodpackage_id"] = "0";
 	param["is_foodpackage"] = "0";
+	param["is_jiacai"] = is_jiacai;
+	param["is_tuicai"] = "0";
+	param["isOpenVip"] = "0";
 
 	return param;
 }
@@ -381,6 +384,34 @@ rapidjson::Document CZhengcanOrderItem::getDiandanTaocanParam(rapidjson::Documen
 	v_num.SetString(num.c_str(), num.length(), allocator);
 	doc.AddMember("quantity", v_num, allocator);
 
+	Value v_is_jiacai;
+	v_is_jiacai.SetString(is_jiacai.c_str(), is_jiacai.length(), allocator);
+	doc.AddMember("is_jiacai", v_is_jiacai, allocator);
+
+	Value v_is_tuicai;
+	v_is_tuicai.SetString(is_tuicai.c_str(), is_tuicai.length(), allocator);
+	doc.AddMember("is_tuicai", v_is_tuicai, allocator);
+
+	std::string is_openvip = "0";
+	Value v_is_openvip;
+	v_is_openvip.SetString(is_openvip.c_str(), is_openvip.length(), allocator);
+	doc.AddMember("isOpenVip", v_is_openvip, allocator);
+
+	std::string open_dabao = "0";
+	Value v_open_dabao;
+	v_open_dabao.SetString(open_dabao.c_str(), open_dabao.length(), allocator);
+	doc.AddMember("open_dabao", v_open_dabao, allocator);
+
+	std::string vip_price = "0";
+	Value v_vip_price;
+	v_vip_price.SetString(vip_price.c_str(), vip_price.length(), allocator);
+	doc.AddMember("vipPrice", v_vip_price, allocator);
+
+	std::string dabao_money = "0";
+	Value v_dabao_money;
+	v_dabao_money.SetString(dabao_money.c_str(), dabao_money.length(), allocator);
+	doc.AddMember("dabao_money", v_dabao_money, allocator);
+
 	std::vector<std::map<string, string>> item;
 
 	//±éÀúÌײ͵Äÿ¸öÉÌÆ·
@@ -421,6 +452,12 @@ rapidjson::Document CZhengcanOrderItem::getDiandanTaocanParam(rapidjson::Documen
 		curFood["type_id"] = foodinfo.type_id;
 		curFood["foodpackage_id"] = foodpackage_id;
 		curFood["is_foodpackage"] = "1";
+		curFood["is_jiacai"] = is_jiacai;
+		curFood["is_tuicai"] = is_tuicai;
+		curFood["isOpenVip"] = "0";
+		curFood["open_dabao"] = "0";
+		curFood["vipPrice"] = "0";
+		curFood["dabao_money"] = "0";
 
 		item.push_back(curFood);
 	}

zhipuzi_pos_windows/zhipuzi/CZhengcanOrderItem.h

@@ -27,11 +27,6 @@ public:
 
 	bool is_nature = false;
 
-	//这3个对历史订单才有
-	std::string is_jiacai;
-	std::string jiacai_no;
-	std::string is_tuicai;
-
 	//会员价
 	bool is_member_price_used;
 	std::vector<MemberPrice> m_member_price;
@@ -46,6 +41,10 @@ public:
 	std::string dabao_money;
 	std::string num; //份数
 
+	std::string is_jiacai;
+	std::string jiacai_no;
+	std::string is_tuicai = "0";
+
 	//这个用来存储所有属性选择的信息，每个属性选择的是第几个，什么价格等等
 	std::vector<FoodNatureSelectValue> natureSelectedArray;