继续做正餐

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_cart_item.xml

@@ -4,7 +4,7 @@
 	<ListContainerElement name="diandan_cart_item" width="380" height="42">
 		<VerticalLayout>
 			<HorizontalLayout height="42"> 
-				<Label name="diandan_cart_item_name" width="220" height="42" align="left" padding="10,0,0,0" endellipsis="true" />
+				<Label name="diandan_cart_item_name" width="220" height="42" align="left" valign="center" padding="10,0,0,0" multiline="true" endellipsis="true" />
 				<Label name="diandan_cart_item_num" width="80" align="center"/> 
 				<Label name="diandan_cart_item_price" width="80" align="center"/>
 			</HorizontalLayout>

bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml

@@ -64,7 +64,7 @@
 					
 					<VerticalLayout height="165" bkcolor="#FFFFFFFF">
 						<HorizontalLayout height="70">
-							<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,8,0,0"></Label>
+							<Label name="diandan_page_otherprice" text="" width="260" align="left" padding="15,8,0,0" multiline="true" endellipsis="true"></Label>
 							<Label name="diandan_page_totalprice" text="总价：¥0.00" font="22" textcolor="#FFFF0000" width="200" align="right" padding="0,0,15,0"></Label>
 						</HorizontalLayout>
 						

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -2918,6 +2918,11 @@ std::map<string, string> CDiandanPageUI::GetSendorderParams()
 		params["coupon_value"] = CLewaimaiString::DoubleToString(m_youhuiquan_youhui, 2);
 	}
 
+	if (m_total_member_youhui > 0)
+	{
+		params["member_delete"] = CLewaimaiString::DoubleToString(m_total_member_youhui, 2);
+	}
+
 	if (m_member_zhekou_youhui > 0)
 	{
 		params["member_discount_money"] = CLewaimaiString::DoubleToString(m_member_zhekou_youhui, 2);

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -169,9 +169,40 @@ void CZhengcanDiandanPageUI::DoGetTableInfo()
 		//桌子开台中，那么开始获取订单信息
 		std::string order_id = CLewaimaiJson::ToString(data["order_id"]);
 
-		std::string name = CLewaimaiJson::ToString(data["name"]);
+		m_table_name = CLewaimaiJson::ToString(data["name"]);
 		CLabelUI* nameLabel = static_cast<CLabelUI*>(this->FindSubControl(L"diandan_page_table_name"));
-		nameLabel->SetText(CLewaimaiString::UTF8ToUnicode(name).c_str());
+		nameLabel->SetText(CLewaimaiString::UTF8ToUnicode(m_table_name).c_str());
+
+		std::string open_table_fee = CLewaimaiJson::ToString(data["open_table_fee"]);
+		std::string table_fee = CLewaimaiJson::ToString(data["table_fee"]);
+
+		if (open_table_fee == "1")
+		{
+			m_kaitai = atof(table_fee.c_str());
+		}
+		else
+		{
+			m_kaitai = 0;
+		}
+
+		std::string open_tea_fee = CLewaimaiJson::ToString(data["open_tea_fee"]);
+		std::string tea_fee = CLewaimaiJson::ToString(data["tea_fee"]);
+
+		if (open_tea_fee == "1")
+		{
+			m_tea_fee = atof(tea_fee.c_str());
+		}
+		else
+		{
+			m_tea_fee = 0;
+		}
+
+		//这里不需要计算实际的茶位费，实际的茶位费是在算总价的时候一起算
+
+		m_renshu = CLewaimaiJson::ToString(data["person_num"]);
+
+		CButtonUI* pCanpaiEdit = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_canpaihao")));
+		pCanpaiEdit->SetText((L"人数 " + CLewaimaiString::UTF8ToUnicode(m_renshu)).c_str());
 
 		if (order_id == "" || order_id == "0")
 		{
@@ -464,12 +495,6 @@ void CZhengcanDiandanPageUI::InitJiesuanShow()
 	m_is_member_zhekou = false;
 	m_member_zhekou_value = 10;
 
-	//再重新设置牌号
-	m_canpai = "";
-
-	CButtonUI* pCanpaiEdit = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_canpaihao")));
-	pCanpaiEdit->SetText(L"输入餐牌号");
-
 	//整单备注
 	CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_label_zhengdanbeizhu")));
 	pLabel->SetText(L"整单备注：");
@@ -860,8 +885,8 @@ void CZhengcanDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 	}
 	else if (name == L"btn_diandan_canpaihao")
 	{
-		//点击餐牌号
-		this->ClickCanpai();
+		//点击人数
+		this->ClickRenshu();
 	}
 	else if (name == L"btn_diandan_weixinzhifu_pay" || name == L"diandan_jiesuan_zhifufangshi_weixinzhifu_btn")
 	{
@@ -1460,16 +1485,16 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 	cur_price -= m_rengong_youhui;
 
-	//开台费
-	m_kaitai = 0;
-
 	//打包费
 	m_dabao = m_cur_diandan_order.getDabaoMoney();
-
 	cur_price += m_dabao;
 
+	//开台费
+	cur_price += m_kaitai;
+
 	//茶位费
-	m_chawei = 0;
+	m_chawei = m_tea_fee * atoi(m_renshu.c_str());
+	cur_price += m_chawei;
 
 	//抹零
 	m_moling_youhui = 0;
@@ -1526,16 +1551,29 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 
 	//再刷新打包费展示
 	CLabelUI* pOtherPriceLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_otherprice")));
+	std::wstring otherPrice = L"";
 	if (m_dabao > 0)
 	{
-		std::wstring ws_dabaofei = L"打包费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_dabao, 2)) + L" 元";
-		pOtherPriceLabel->SetText(ws_dabaofei.c_str());
+		std::wstring ws_dabaofei = L"打包费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_dabao, 2)) + L" 元 ";
+		otherPrice += ws_dabaofei;
 	}
-	else
+
+	//开台费
+	if (m_kaitai > 0)
+	{
+		std::wstring ws_kaitaifei = L"开台费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_kaitai, 2)) + L" 元 ";
+		otherPrice += ws_kaitaifei;
+	}
+
+	//茶位费
+	if (m_chawei > 0)
 	{
-		pOtherPriceLabel->SetText(L"");
+		std::wstring ws_chaweifei = L"茶位费 " + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_chawei, 2)) + L" 元 ";
+		otherPrice += ws_chaweifei;
 	}
 
+	pOtherPriceLabel->SetText(otherPrice.c_str());
+
 	//再刷新总价展示
 	CLabelUI* pTotalPrice = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_totalprice")));
 	pTotalPrice->SetText((L"总价：¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(cur_price, 2))).c_str());
@@ -1741,6 +1779,38 @@ void CZhengcanDiandanPageUI::UpdateJiesuanInfo()
 		item_num++;
 	}
 
+	if (m_kaitai > 0)
+	{
+		CDialogBuilder builder;
+		CDialogBuilderCallbackEx cb;
+		CHorizontalLayoutUI* pItem = static_cast<CHorizontalLayoutUI*>(builder.Create(_T("diandan_zhangdanmingxi_item.xml"), (UINT)0, &cb, m_pManager));
+		pmingxiLayout->Add(pItem);
+
+		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
+		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
+
+		pName->SetText(L"开台费：");
+		pValue->SetText((L"+" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_kaitai, 2)) + L"元").c_str());
+
+		item_num++;
+	}
+
+	if (m_chawei > 0)
+	{
+		CDialogBuilder builder;
+		CDialogBuilderCallbackEx cb;
+		CHorizontalLayoutUI* pItem = static_cast<CHorizontalLayoutUI*>(builder.Create(_T("diandan_zhangdanmingxi_item.xml"), (UINT)0, &cb, m_pManager));
+		pmingxiLayout->Add(pItem);
+
+		CLabelUI* pName = static_cast<CLabelUI*>(pItem->FindSubControl(_T("name")));
+		CLabelUI* pValue = static_cast<CLabelUI*>(pItem->FindSubControl(_T("value")));
+
+		pName->SetText(L"茶位费：");
+		pValue->SetText((L"+" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(m_chawei, 2)) + L"元").c_str());
+
+		item_num++;
+	}
+
 	if (m_jiajia > 0)
 	{
 		CDialogBuilder builder;
@@ -2320,6 +2390,13 @@ void CZhengcanDiandanPageUI::ClickPayBtn()
 		return;
 	}
 
+	if (m_cur_diandan_order.m_order_history_array.size() == 0)
+	{
+		m_pMainWnd->ShowToast(L"您还没有下单，请先下单再结账");
+
+		return;
+	}
+
 	ShowJiesuanPage();
 }
 
@@ -2834,7 +2911,7 @@ void CZhengcanDiandanPageUI::ClickSaomaCika()
 	}
 }
 
-void CZhengcanDiandanPageUI::ClickCanpai()
+void CZhengcanDiandanPageUI::ClickRenshu()
 {
 	if (m_is_show_modal_wnd == true)
 	{
@@ -2852,20 +2929,21 @@ void CZhengcanDiandanPageUI::ClickCanpai()
 		pCanpaiDlg->SetIcon(IDI_ICON_DUILIB);
 		pCanpaiDlg->CenterWindow();
 
-		pCanpaiDlg->SetTitle(L"输入餐牌号");
+		pCanpaiDlg->SetTitle(L"填写人数");
 
 		UINT ret = pCanpaiDlg->ShowModal();
 
 		if (ret == IDOK)
 		{
-			//这说明折扣输入了
+			//这说明人数输入了
 			std::string canpai = pCanpaiDlg->getContent();
 
-			m_canpai = canpai;
+			m_renshu = canpai;
 
 			CButtonUI* pCanpaiEdit = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_canpaihao")));
-			pCanpaiEdit->SetText((L"餐牌号 " + CLewaimaiString::UTF8ToUnicode(canpai)).c_str());
+			pCanpaiEdit->SetText((L"人数 " + CLewaimaiString::UTF8ToUnicode(canpai)).c_str());
 
+			//人数变更之后，要重新修改价格信息
 			this->UpdateJiesuanInfo();
 
 			m_is_show_modal_wnd = false;
@@ -2888,13 +2966,18 @@ std::map<string, string> CZhengcanDiandanPageUI::GetSendorderParams()
 	std::map<string, string> params;
 
 	params["order_no"] = CRandomHelper::GetRandString(20);
+	params["order_id"] = m_order_id;
+	params["table_id"] = m_table_id;
+	params["is_clear"] = "1";
 
 	//构建food_list参数
 	params["food_list"] = m_cur_diandan_order.getDiandanFoodlistParam();
 	params["foodpackage_array"] = m_cur_diandan_order.getDiandanTaocanParam();
-	params["person_num"] = "1";
-	params["table_name"] = m_canpai;
+	params["person_num"] = m_renshu;
+	params["table_name"] = m_table_name;
 	params["note"] = m_cur_diandan_order.GetMemo();
+	params["cover_charge"] = CLewaimaiString::DoubleToString(m_chawei, 2); //茶位费
+	params["activation_fee"] = CLewaimaiString::DoubleToString(m_kaitai, 2); //开台费
 	params["dabao_price"] = CLewaimaiString::DoubleToString(m_dabao, 2);
 	params["food_price"] = CLewaimaiString::DoubleToString(m_cur_diandan_order.getTotalPrice(), 2);
 	params["total_price"] = CLewaimaiString::DoubleToString(m_cur_diandan_order.getTotalPrice() + m_dabao, 2);
@@ -2976,6 +3059,15 @@ std::map<string, string> CZhengcanDiandanPageUI::GetSendorderParams()
 		params["coupon_value"] = CLewaimaiString::DoubleToString(m_youhuiquan_youhui, 2);
 	}
 
+	if (m_total_member_youhui > 0)
+	{
+		params["member_delete"] = CLewaimaiString::DoubleToString(m_total_member_youhui, 2);
+	}
+	else
+	{
+		params["member_delete"] = "0";
+	}
+
 	if (m_member_zhekou_youhui > 0)
 	{
 		params["member_discount_money"] = CLewaimaiString::DoubleToString(m_member_zhekou_youhui, 2);
@@ -3008,9 +3100,9 @@ void CZhengcanDiandanPageUI::StartWeixinzhifuShoukuan(std::string fukuanma)
 		return;
 	}
 
-	if (m_cur_diandan_order.getItemNum() == 0)
+	if (m_cur_diandan_order.m_order_history_array.size() == 0)
 	{
-		m_pMainWnd->ShowToast(L"请先选择商品再支付");
+		m_pMainWnd->ShowToast(L"您还没有下单，请先下单再结账");
 
 		return;
 	}
@@ -3032,6 +3124,8 @@ void CZhengcanDiandanPageUI::StartWeixinzhifuShoukuan(std::string fukuanma)
 		//这里要对提交订单的参数进行组装，然后方便请求
 		pShoukuanWnd->SetCommonParams(GetSendorderParams());
 
+		pShoukuanWnd->SetType(2);
+
 		if (fukuanma != "")
 		{
 			pShoukuanWnd->InitFukuanma(fukuanma);
@@ -3060,10 +3154,9 @@ void CZhengcanDiandanPageUI::StartWeixinzhifuShoukuan(std::string fukuanma)
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, zhifu_type);
 
 			m_pMainWnd->ShowToast(L"收款成功！");
-		}
-		else
-		{
-			int a = 1;
+
+			//收款成功后返回桌台
+			m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 		}
 
 		m_is_show_modal_wnd = false;
@@ -3078,9 +3171,9 @@ void CZhengcanDiandanPageUI::StartHuiyuanShoukuan()
 		return;
 	}
 
-	if (m_cur_diandan_order.getItemNum() == 0)
+	if (m_cur_diandan_order.m_order_history_array.size() == 0)
 	{
-		m_pMainWnd->ShowToast(L"请先选择商品再支付");
+		m_pMainWnd->ShowToast(L"您还没有下单，请先下单再结账");
 
 		return;
 	}
@@ -3102,6 +3195,8 @@ void CZhengcanDiandanPageUI::StartHuiyuanShoukuan()
 		//这里要对提交订单的参数进行组装，然后方便请求
 		pShoukuanWnd->SetCommonParams(GetSendorderParams());
 
+		pShoukuanWnd->SetType(2);
+
 		/*
 		if (m_is_start_catch && m_catch_string.length() == 18)
 		{
@@ -3119,6 +3214,9 @@ void CZhengcanDiandanPageUI::StartHuiyuanShoukuan()
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "huiyuanzhifu", balance, member_number);
 
 			m_pMainWnd->ShowToast(L"收款成功！");
+
+			//收款成功后返回桌台
+			m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 		}
 
 		m_is_show_modal_wnd = false;
@@ -3134,9 +3232,9 @@ void CZhengcanDiandanPageUI::StartXianjinShoukuan()
 		return;
 	}
 
-	if (m_cur_diandan_order.getItemNum() == 0)
+	if (m_cur_diandan_order.m_order_history_array.size() == 0)
 	{
-		m_pMainWnd->ShowToast(L"请先选择商品再支付");
+		m_pMainWnd->ShowToast(L"您还没有下单，请先下单再结账");
 
 		return;
 	}
@@ -3158,6 +3256,8 @@ void CZhengcanDiandanPageUI::StartXianjinShoukuan()
 		//这里要对提交订单的参数进行组装，然后方便请求
 		pShoukuanWnd->SetCommonParams(GetSendorderParams());
 
+		pShoukuanWnd->SetType(2);
+
 		/*
 		if (m_is_start_catch && m_catch_string.length() == 18)
 		{
@@ -3175,6 +3275,9 @@ void CZhengcanDiandanPageUI::StartXianjinShoukuan()
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "xianjinzhifu");
 
 			m_pMainWnd->ShowToast(L"收款成功！");
+
+			//收款成功后返回桌台
+			m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 		}
 
 		m_is_show_modal_wnd = false;
@@ -3189,9 +3292,9 @@ void CZhengcanDiandanPageUI::StartFulikaShoukuan()
 		return;
 	}
 
-	if (m_cur_diandan_order.getItemNum() == 0)
+	if (m_cur_diandan_order.m_order_history_array.size() == 0)
 	{
-		m_pMainWnd->ShowToast(L"请先选择商品再支付");
+		m_pMainWnd->ShowToast(L"您还没有下单，请先下单再结账");
 
 		return;
 	}
@@ -3213,6 +3316,8 @@ void CZhengcanDiandanPageUI::StartFulikaShoukuan()
 		//这里要对提交订单的参数进行组装，然后方便请求
 		pShoukuanWnd->SetCommonParams(GetSendorderParams());
 
+		pShoukuanWnd->SetType(2);
+
 		/*
 		if (m_is_start_catch && m_catch_string.length() == 18)
 		{
@@ -3227,6 +3332,9 @@ void CZhengcanDiandanPageUI::StartFulikaShoukuan()
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "fulikazhifu");
 
 			m_pMainWnd->ShowToast(L"收款成功！");
+
+			//收款成功后返回桌台
+			m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 		}
 
 		m_is_show_modal_wnd = false;
@@ -3241,9 +3349,9 @@ void CZhengcanDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstri
 		return;
 	}
 
-	if (m_cur_diandan_order.getItemNum() == 0)
+	if (m_cur_diandan_order.m_order_history_array.size() == 0)
 	{
-		m_pMainWnd->ShowToast(L"请先选择商品再支付");
+		m_pMainWnd->ShowToast(L"您还没有下单，请先下单再结账");
 
 		return;
 	}
@@ -3265,6 +3373,8 @@ void CZhengcanDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstri
 		//这里要对提交订单的参数进行组装，然后方便请求
 		pShoukuanWnd->SetCommonParams(GetSendorderParams());
 
+		pShoukuanWnd->SetType(2);
+
 		/*
 		if (m_is_start_catch && m_catch_string.length() == 18)
 		{
@@ -3282,6 +3392,9 @@ void CZhengcanDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstri
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "zidingyizhifu");
 
 			m_pMainWnd->ShowToast(L"收款成功！");
+
+			//收款成功后返回桌台
+			m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 		}
 
 		m_is_show_modal_wnd = false;

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.h

@@ -155,8 +155,8 @@ public:
 	//点击取消次卡
 	void ClickQuxiaoCika();
 
-	//点击餐牌号按钮
-	void ClickCanpai();
+	//点击人数号按钮
+	void ClickRenshu();
 
 	//开始进行微信支付收款，如果fukuanma不为空，默认自动唤起支付
 	void StartWeixinzhifuShoukuan(std::string fukuanma = "");
@@ -245,10 +245,11 @@ private:
 	double m_rengong_youhui;
 
 	//开台费
-	double m_kaitai;
+	double m_kaitai = 0;
 
 	//茶位费
-	double m_chawei;
+	double m_tea_fee = 0; //单个人的茶位费
+	double m_chawei = 0; //根据人数的实际茶位费
 
 	//打包费
 	double m_dabao;
@@ -315,7 +316,7 @@ private:
 	std::string m_zhaoling_value;
 
 	//餐牌
-	std::string m_canpai;
+	std::string m_renshu;
 
 	//模态对话框有关的
 	bool m_is_show_modal_wnd = false;
@@ -330,6 +331,9 @@ private:
 	//当前点餐对应的桌子id
 	std::string m_table_id;
 
+	//当前点餐对应的桌子名字
+	std::string m_table_name;
+
 	//当前桌子关联的订单ID
 	std::string m_order_id;
 };

zhipuzi_pos_windows/tool/CSqlite3.cpp

@@ -1699,6 +1699,47 @@ bool CSqlite3::GetFoodByPluBianma(std::string barcode, CFood& newFood)
 	return is_found;
 }
 
+bool CSqlite3::GetFoodpackageById(std::string foodpackage_id, CFoodpackage& newFoodpackage)
+{
+	bool is_found = false;
+
+	std::string sql = "SELECT * FROM pos_foodpackage WHERE id = '" + foodpackage_id + "'";
+
+	sqlite3_stmt * stmt = NULL;
+
+	if (sqlite3_prepare_v2(m_db, sql.c_str(), -1, &stmt, NULL) == SQLITE_OK)
+	{
+		while (sqlite3_step(stmt) == SQLITE_ROW)
+		{
+			is_found = true;
+
+			newFoodpackage.id = (char*)sqlite3_column_text(stmt, 0);
+			newFoodpackage.shop_id = (char*)sqlite3_column_text(stmt, 1);
+			newFoodpackage.name = (char*)sqlite3_column_text(stmt, 2);
+			newFoodpackage.price = (char*)sqlite3_column_text(stmt, 3);
+			newFoodpackage.tag = (char*)sqlite3_column_text(stmt, 4);
+			newFoodpackage.status = (char*)sqlite3_column_text(stmt, 5);
+			newFoodpackage.is_dabao = (char*)sqlite3_column_text(stmt, 6);
+			newFoodpackage.dabao_money = (char*)sqlite3_column_text(stmt, 7);
+			newFoodpackage.nature = (char*)sqlite3_column_text(stmt, 8);
+			newFoodpackage.goods_img = (char*)sqlite3_column_text(stmt, 9);
+			newFoodpackage.unit = (char*)sqlite3_column_text(stmt, 10);
+			newFoodpackage.supporttype = (char*)sqlite3_column_text(stmt, 11);
+			newFoodpackage.is_shouyinji_show = (char*)sqlite3_column_text(stmt, 12);
+			newFoodpackage.barcode = (char*)sqlite3_column_text(stmt, 13);
+		}
+
+		sqlite3_finalize(stmt);
+	}
+	else
+	{
+		//异常情况
+		sqlite3_finalize(stmt);
+	}
+
+	return is_found;
+}
+
 //更新商品ID的库存
 void CSqlite3::UpdateFoodStock(std::string food_id, std::string stock)
 {

zhipuzi_pos_windows/tool/CSqlite3.h

@@ -67,6 +67,9 @@ public:
 	//通过PLU商品编码查找商品，如果找到返回true，找不到返回false
 	bool GetFoodByPluBianma(std::string barcode, CFood& newFood);
 
+	//通过套餐ID获取套餐信息
+	bool GetFoodpackageById(std::string foodpackage_id, CFoodpackage& newFoodpackage);
+
 	//更新商品ID的库存
 	void UpdateFoodStock(std::string food_id, std::string stock);
 private:

zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp

@@ -921,7 +921,15 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/sendorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/sendorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/pay";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), m_commonParams, response);
 	if (ret == false)
 	{
@@ -1005,10 +1013,14 @@ void CFulikaShoukuanWnd::HandleShoukuan()
 
 		Value& stock = data["stock"];
 		m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-		m_take_food_code = data["take_food_code"].GetString();
 		m_show_trade_no = data["show_trade_no"].GetString();
 
+		if (m_nType == 1)
+		{
+			//快餐才有取餐号
+			m_take_food_code = data["take_food_code"].GetString();
+		}
+
 		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
@@ -1047,7 +1059,15 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 	{
 		std::string response;
 
-		std::string url = "/diancan/queryorderstatus";
+		std::string url;
+		if (m_nType == 1)
+		{
+			url = "/diancan/queryorderstatus";
+		}
+		else if (m_nType == 2)
+		{
+			url = "/dinnercash/queryorderstatus";
+		}
 		bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 		if (ret == false)
 		{
@@ -1109,10 +1129,14 @@ void CFulikaShoukuanWnd::HandleShoukuanPassword()
 
 			Value& stock = data["stock"];
 			m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-			m_take_food_code = data["take_food_code"].GetString();
 			m_show_trade_no = data["show_trade_no"].GetString();
 
+			if (m_nType == 1)
+			{
+				//快餐才有取餐号
+				m_take_food_code = data["take_food_code"].GetString();
+			}
+
 			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
@@ -1160,7 +1184,15 @@ void CFulikaShoukuanWnd::HandleCancelShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/closeorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/closeorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/closeorder";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 	if (ret == false)
 	{

zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.h

@@ -86,6 +86,11 @@ public:
 
 	void ReadShoukuanValue();
 
+	void SetType(int nType)
+	{
+		m_nType = nType;
+	}
+
 	//处理键盘捕捉结果
 	void HandleTextCapture(std::string content);
 
@@ -117,5 +122,8 @@ public:
 	std::string m_out_trade_no;
 	std::string m_take_food_code;
 	std::string m_show_trade_no;
+
+	//当前收款场景 1 点单收银 2正餐收银 3扫码收银
+	int m_nType = 1;
 };
 

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.cpp

@@ -1002,7 +1002,15 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/sendorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/sendorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/pay";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), m_commonParams, response);
 	if (ret == false)
 	{
@@ -1076,9 +1084,14 @@ void CHuiyuanShoukuanWnd::HandleShoukuan()
 
 		Value& stock = data["stock"];
 		m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-		m_take_food_code = data["take_food_code"].GetString();
 		m_show_trade_no = data["show_trade_no"].GetString();
+
+		if (m_nType == 1)
+		{
+			//快餐才有取餐号
+			m_take_food_code = data["take_food_code"].GetString();
+		}
+
 		m_balance = CLewaimaiString::DoubleToString(data["balance"].GetFloat(), 2);
 		m_member_number = data["member_number"].GetString();
 
@@ -1120,7 +1133,15 @@ void CHuiyuanShoukuanWnd::HandleShoukuanPassword()
 	{
 		std::string response;
 
-		std::string url = "/diancan/queryorderstatus";
+		std::string url;
+		if (m_nType == 1)
+		{
+			url = "/diancan/queryorderstatus";
+		}
+		else if (m_nType == 2)
+		{
+			url = "/dinnercash/queryorderstatus";
+		}
 		bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 		if (ret == false)
 		{
@@ -1182,10 +1203,14 @@ void CHuiyuanShoukuanWnd::HandleShoukuanPassword()
 
 			Value& stock = data["stock"];
 			m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-			m_take_food_code = data["take_food_code"].GetString();
 			m_show_trade_no = data["show_trade_no"].GetString();
 
+			if (m_nType == 1)
+			{
+				//快餐才有取餐号
+				m_take_food_code = data["take_food_code"].GetString();
+			}
+
 			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
@@ -1233,7 +1258,15 @@ void CHuiyuanShoukuanWnd::HandleCancelShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/closeorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/closeorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/closeorder";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 	if (ret == false)
 	{

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.h

@@ -86,6 +86,11 @@ public:
 
 	void ReadShoukuanValue();
 
+	void SetType(int nType)
+	{
+		m_nType = nType;
+	}
+
 	//处理键盘捕捉结果
 	void HandleTextCapture(std::string content);
 
@@ -119,5 +124,8 @@ public:
 	std::string m_show_trade_no;
 	std::string m_balance;
 	std::string m_member_number;
+
+	//当前收款场景 1 点单收银 2正餐收银 3扫码收银
+	int m_nType = 1;
 };
 

zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp

@@ -613,7 +613,15 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/sendorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/sendorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/pay";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), m_commonParams, response);
 	if (ret == false)
 	{
@@ -687,11 +695,15 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuan()
 
 		Value& stock = data["stock"];
 		m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-		m_take_food_code = data["take_food_code"].GetString();
 		m_show_trade_no = data["show_trade_no"].GetString();
 
-		m_trade_no = data["trade_no"].GetString();
+		if (m_nType == 1)
+		{
+			//快餐才有取餐号
+			m_take_food_code = data["take_food_code"].GetString();
+
+			m_trade_no = data["trade_no"].GetString();
+		}
 
 		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
@@ -733,7 +745,15 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 	{
 		std::string response;
 
-		std::string url = "/diancan/queryorderstatus";
+		std::string url;
+		if (m_nType == 1)
+		{
+			url = "/diancan/queryorderstatus";
+		}
+		else if (m_nType == 2)
+		{
+			url = "/dinnercash/queryorderstatus";
+		}
 		bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 		if (ret == false)
 		{
@@ -795,10 +815,14 @@ void CWeixinzhifuShoukuanWnd::HandleShoukuanPassword()
 
 			Value& stock = data["stock"];
 			m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-			m_take_food_code = data["take_food_code"].GetString();
 			m_show_trade_no = data["show_trade_no"].GetString();
 
+			if (m_nType == 1)
+			{
+				//快餐才有取餐号
+				m_take_food_code = data["take_food_code"].GetString();
+			}
+
 			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
@@ -846,7 +870,15 @@ void CWeixinzhifuShoukuanWnd::HandleCancelShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/closeorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/closeorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/closeorder";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 	if (ret == false)
 	{

zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.h

@@ -88,6 +88,11 @@ public:
 
 	void ReadShoukuanValue();
 
+	void SetType(int nType)
+	{
+		m_nType = nType;
+	}
+
 	//处理键盘捕捉结果
 	void HandleTextCapture(std::string content);
 
@@ -116,5 +121,8 @@ public:
 	std::string m_trade_no;
 	std::string m_take_food_code;
 	std::string m_show_trade_no;
+
+	//当前收款场景 1 点单收银 2正餐收银 3扫码收银
+	int m_nType = 1;
 };
 

zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp

@@ -699,7 +699,15 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 	
 	std::string response;
 
-	std::string url = "/diancan/sendorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/sendorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/pay";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), m_commonParams, response);
 	if (ret == false)
 	{
@@ -773,10 +781,14 @@ void CXianjinShoukuanWnd::HandleShoukuan()
 
 		Value& stock = data["stock"];
 		m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-		m_take_food_code = data["take_food_code"].GetString();
 		m_show_trade_no = data["show_trade_no"].GetString();
 
+		if (m_nType == 1)
+		{
+			//快餐才有取餐号
+			m_take_food_code = data["take_food_code"].GetString();
+		}
+
 		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
@@ -815,7 +827,16 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 	{
 		std::string response;
 
-		std::string url = "/diancan/queryorderstatus";
+		std::string url;
+		if (m_nType == 1)
+		{
+			url = "/diancan/queryorderstatus";
+		}
+		else if (m_nType == 2)
+		{
+			url = "/dinnercash/queryorderstatus";
+		}
+
 		bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 		if (ret == false)
 		{
@@ -877,10 +898,14 @@ void CXianjinShoukuanWnd::HandleShoukuanPassword()
 
 			Value& stock = data["stock"];
 			m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-			m_take_food_code = data["take_food_code"].GetString();
 			m_show_trade_no = data["show_trade_no"].GetString();
 
+			if (m_nType == 1)
+			{
+				//快餐才有取餐号
+				m_take_food_code = data["take_food_code"].GetString();
+			}
+
 			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
@@ -928,7 +953,15 @@ void CXianjinShoukuanWnd::HandleCancelShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/closeorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/closeorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/closeorder";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 	if (ret == false)
 	{

zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.h

@@ -87,6 +87,11 @@ public:
 
 	void UpdateZhaoling();
 
+	void SetType(int nType)
+	{
+		m_nType = nType;
+	}
+
 	//处理键盘捕捉结果
 	void HandleTextCapture(std::string content)
 	{
@@ -114,7 +119,10 @@ public:
 	//支付成功返回的字段
 	std::string m_kucun_string;
 	std::string m_out_trade_no;
-	std::string m_take_food_code;
 	std::string m_show_trade_no;
+	std::string m_take_food_code;
+
+	//当前收款场景 1 点单收银 2正餐收银 3扫码收银
+	int m_nType = 1;
 };
 

zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.cpp

@@ -483,7 +483,15 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/sendorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/sendorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/pay";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), m_commonParams, response);
 	if (ret == false)
 	{
@@ -557,10 +565,14 @@ void CZidingyiShoukuanWnd::HandleShoukuan()
 
 		Value& stock = data["stock"];
 		m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-		m_take_food_code = data["take_food_code"].GetString();
 		m_show_trade_no = data["show_trade_no"].GetString();
 
+		if (m_nType == 1)
+		{
+			//快餐才有取餐号
+			m_take_food_code = data["take_food_code"].GetString();
+		}
+
 		SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 	}
 	else if (s_status == "fail")
@@ -599,7 +611,15 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 	{
 		std::string response;
 
-		std::string url = "/diancan/queryorderstatus";
+		std::string url;
+		if (m_nType == 1)
+		{
+			url = "/diancan/queryorderstatus";
+		}
+		else if (m_nType == 2)
+		{
+			url = "/dinnercash/queryorderstatus";
+		}
 		bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 		if (ret == false)
 		{
@@ -661,10 +681,14 @@ void CZidingyiShoukuanWnd::HandleShoukuanPassword()
 
 			Value& stock = data["stock"];
 			m_kucun_string = CLewaimaiJson::JsonToString(stock);
-
-			m_take_food_code = data["take_food_code"].GetString();
 			m_show_trade_no = data["show_trade_no"].GetString();
 
+			if (m_nType == 1)
+			{
+				//快餐才有取餐号
+				m_take_food_code = data["take_food_code"].GetString();
+			}
+
 			SendMessage(WM_SHOUKUAN_STATUS_SUCCESS, 0, 0);
 
 			break;
@@ -712,7 +736,15 @@ void CZidingyiShoukuanWnd::HandleCancelShoukuan()
 
 	std::string response;
 
-	std::string url = "/diancan/closeorder";
+	std::string url;
+	if (m_nType == 1)
+	{
+		url = "/diancan/closeorder";
+	}
+	else if (m_nType == 2)
+	{
+		url = "/dinnercash/closeorder";
+	}
 	bool ret = CZhipuziHttpClient::GetInstance()->Request(url.c_str(), params, response);
 	if (ret == false)
 	{

zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.h

@@ -88,6 +88,11 @@ public:
 	void SetZidingyiName(std::wstring name);
 	void SetZidingyiId(std::wstring selfpay_id);
 
+	void SetType(int nType)
+	{
+		m_nType = nType;
+	}
+
 	//处理键盘捕捉结果
 	void HandleTextCapture(std::string content)
 	{
@@ -117,5 +122,8 @@ public:
 	std::string m_out_trade_no;
 	std::string m_take_food_code;
 	std::string m_show_trade_no;
+
+	//当前收款场景 1 点单收银 2正餐收银 3扫码收银
+	int m_nType = 1;
 };
 

zhipuzi_pos_windows/zhipuzi/CZhengcanOrder.cpp

@@ -437,6 +437,19 @@ double CZhengcanOrder::getDabaoMoney()
 		total_dabao += item_dabao;
 	}
 
+	//继续在已下单的订单里面找
+	for (std::vector<CZhengcanOrderHistoryXiadan>::iterator it = m_order_history_array.begin(); it != m_order_history_array.end(); it++)
+	{
+		for (std::vector<CZhengcanOrderItem>::iterator it1 = it->m_items.begin(); it1 != it->m_items.end(); it1++)
+		{
+			CZhengcanOrderItem curItem = *it1;
+
+			double item_dabao = curItem.getDabaoMoney();
+
+			total_dabao += item_dabao;
+		}
+	}
+
 	return total_dabao;
 }
 
@@ -607,7 +620,7 @@ bool CZhengcanOrder::InitData(std::string order_id)
 			CZhengcanOrderItem newItem;
 			newItem.m_is_history_item = true;
 
-			newItem.food_id = CLewaimaiJson::ToString(foodinfo["id"]);
+			newItem.food_id = CLewaimaiJson::ToString(foodinfo["food_id"]);
 			newItem.food_name = CLewaimaiJson::ToString(foodinfo["food_name"]);
 			newItem.type_id = CLewaimaiJson::ToString(foodinfo["type_id"]);
 			newItem.price = CLewaimaiJson::ToString(foodinfo["single_price"]);
@@ -622,7 +635,9 @@ bool CZhengcanOrder::InitData(std::string order_id)
 				newItem.is_dabao = false;
 			}
 
-			newItem.dabao_money = CLewaimaiJson::ToString(foodinfo["dabao_money"]);
+			//目前服务器返回的dabao_money一直为0，是不对的，暂时不用这个，下面从数据库里读取
+			//newItem.dabao_money = CLewaimaiJson::ToString(foodinfo["dabao_money"]);
+
 			newItem.is_jiacai = CLewaimaiJson::ToString(foodinfo["is_jiacai"]);
 			newItem.jiacai_no = CLewaimaiJson::ToString(foodinfo["jiacai_no"]);
 			newItem.is_tuicai = CLewaimaiJson::ToString(foodinfo["is_tuicai"]);
@@ -633,6 +648,8 @@ bool CZhengcanOrder::InitData(std::string order_id)
 			bool ret = sqlite.GetFoodById(newItem.food_id, foodinfo_bendi);
 			if (ret == true)
 			{
+				newItem.dabao_money = foodinfo_bendi.dabao_money;
+
 				if (foodinfo_bendi.member_price_used == "1")
 				{
 					newItem.is_member_price_used = true;
@@ -671,7 +688,10 @@ bool CZhengcanOrder::InitData(std::string order_id)
 			}
 			else
 			{
+				//说明已下单的商品，已经被从本地删除了！
 				newItem.is_member_price_used = false;
+
+				newItem.dabao_money = "0";
 			}
 
 			newItem.UpdateShowPrice();
@@ -692,6 +712,29 @@ bool CZhengcanOrder::InitData(std::string order_id)
 			newItem.price = cur_foodpackage["single_price"].GetString();
 			newItem.foodpackage_id = cur_foodpackage["foodpackage_id"].GetString();
 
+			if (CLewaimaiJson::ToString(cur_foodpackage["is_dabao"]) == "1")
+			{
+				newItem.is_dabao = true;
+			}
+			else
+			{
+				newItem.is_dabao = false;
+			}
+
+			//从数据库读取套餐的打包费信息
+			CFoodpackage foodpackageinfo;
+			CSqlite3 sqlite;
+			bool ret = sqlite.GetFoodpackageById(newItem.foodpackage_id, foodpackageinfo);
+			if (ret == true)
+			{
+				newItem.dabao_money = foodpackageinfo.dabao_money;
+			}
+			else
+			{
+				//说明已下单的套餐，已经被从本地删除了！
+				newItem.dabao_money = "0";
+			}
+
 			newItem.m_is_taocan = true;
 
 			std::string taocan_name = cur_foodpackage["food_name"].GetString();

zhipuzi_pos_windows/zhipuzi/CZhengcanOrder.h

@@ -185,7 +185,7 @@ public:
 
 	/****************************下面这里开始，用于与服务器交互的函数*/
 
-	//根据订单ID，从服务器获取订单的数据，主要用于打印和展示订单详情
+	//根据订单ID，从服务器获取订单的数据，保存到CZhegncanOrder中，用于获取已下单信息、打印、订单详情展示等
 	bool InitData(std::string order_id);
 
 	//根据订单ID，进行退款操作

zhipuzi_pos_windows/zhipuzi/CZhengcanOrderItem.cpp

@@ -334,6 +334,8 @@ std::map<string, string> CZhengcanOrderItem::getDiandanParam()
 		param["is_dabao"] = "0";
 	}
 
+	param["dabao_money"] = dabao_money;
+
 	param["quantity"] = num;
 	param["type_id"] = m_foodinfo.type_id;
 	param["foodpackage_id"] = "0";
@@ -373,13 +375,17 @@ rapidjson::Document CZhengcanOrderItem::getDiandanTaocanParam(rapidjson::Documen
 
 	if (is_dabao)
 	{
-		doc.AddMember("is_dabao", "0", allocator);
+		doc.AddMember("is_dabao", "1", allocator);
 	}
 	else
 	{
-		doc.AddMember("is_dabao", "1", allocator);
+		doc.AddMember("is_dabao", "0", allocator);
 	}
 
+	Value v_dabao_money;
+	v_dabao_money.SetString(dabao_money.c_str(), dabao_money.length(), allocator);
+	doc.AddMember("dabao_money", v_dabao_money, allocator);
+
 	Value v_num;
 	v_num.SetString(num.c_str(), num.length(), allocator);
 	doc.AddMember("quantity", v_num, allocator);
@@ -407,11 +413,6 @@ rapidjson::Document CZhengcanOrderItem::getDiandanTaocanParam(rapidjson::Documen
 	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;
 
 	//±éÀúÌײ͵Äÿ¸öÉÌÆ·