还剩一个交班单的问题

zhipuzi_pos_windows/helper/CLewaimaiJson.cpp

@@ -112,6 +112,10 @@ std::string CLewaimaiJson::ToString(const rapidjson::Value& valObj)
 	{
 		return to_string(valObj.GetInt());
 	}
+	else if (valObj.IsDouble())
+	{
+		return to_string(valObj.GetDouble());
+	}
 	else
 	{
 		return "";

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -435,6 +435,8 @@ void CDiandanPageUI::InitJiesuanShow()
 
 void CDiandanPageUI::InitJiesuanZhifu()
 {
+	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhifufangshi_layout")));
+
 	int num = 0;
 
 	CHorizontalLayoutUI* pWeixinLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhifufangshi_weixinzhifu")));
@@ -447,7 +449,7 @@ void CDiandanPageUI::InitJiesuanZhifu()
 	}
 	else
 	{
-		pWeixinLayout->SetVisible(false);
+		pZhifufangshiLayout->RemoveAt(num);
 	}
 
 	//会员支付
@@ -460,7 +462,7 @@ void CDiandanPageUI::InitJiesuanZhifu()
 	}
 	else
 	{
-		pHuiyuanLayout->SetVisible(false);
+		pZhifufangshiLayout->RemoveAt(num);
 	}
 
 	//现金支付
@@ -473,7 +475,7 @@ void CDiandanPageUI::InitJiesuanZhifu()
 	}
 	else
 	{
-		pXianjinLayout->SetVisible(false);
+		pZhifufangshiLayout->RemoveAt(num);
 	}
 
 	/*
@@ -514,11 +516,9 @@ void CDiandanPageUI::InitJiesuanZhifu()
 	}
 	else
 	{
-		pFulikaLayout->SetVisible(false);
+		pZhifufangshiLayout->RemoveAt(num);
 	}
 
-	CHorizontalLayoutUI* pZhifufangshiLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_jiesuan_zhifufangshi_layout")));
-
 	//接着添加自定义支付的
 	for (std::vector<SelfPay>::iterator it = CShopinfo::GetInstance()->m_self_pay.begin(); it != CShopinfo::GetInstance()->m_self_pay.end(); it++)
 	{
@@ -539,6 +539,7 @@ void CDiandanPageUI::InitJiesuanZhifu()
 			//设置定义属性，在点击按钮的时候好区分
 			newButton->SetAttribute(L"name", L"diandan_jiesuan_zhifufangshi_zidingyi_btn");
 			newButton->AddCustomAttribute(L"selfpay_id", CLewaimaiString::UTF8ToUnicode(selfpay.id).c_str());
+			newButton->SetAttribute(L"float", L"true");
 
 			//必须先Add，才能调用下面的SetPos，否则无效
 			pZhifufangshiLayout->Add(newButton);
@@ -590,7 +591,6 @@ void CDiandanPageUI::UpdateJiesuanZhifuPos()
 		rect.top = (curRow - 1) * 100 + 20;
 		rect.bottom = rect.top + 80;
 
-		curItem->SetFloat(true);
 		curItem->SetPos(rect);
 
 		num++;
@@ -1807,8 +1807,8 @@ void CDiandanPageUI::ClickFoodAction()
 			rapidjson::Value& member_price_info = member_price[i];
 
 			MemberPrice newPirce;
-			newPirce.id = member_price_info["id"].GetString();
-			newPirce.level = member_price_info["level"].GetString();
+			newPirce.id = CLewaimaiJson::ToString(member_price_info["id"]);
+			newPirce.level = CLewaimaiJson::ToString(member_price_info["level"]);
 
 			if (member_price_info["price"].IsString())
 			{
@@ -3000,6 +3000,8 @@ void CDiandanPageUI::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
 		{
@@ -3058,6 +3060,7 @@ void CDiandanPageUI::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_is_show_modal_wnd = false;
@@ -3112,6 +3115,8 @@ void CDiandanPageUI::StartXianjinShoukuan()
 
 			//说明收款成功了，需要进行一些后续的处理
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "xianjinzhifu");
+
+			m_pMainWnd->ShowToast(L"收款成功！");
 		}
 
 		m_is_show_modal_wnd = false;
@@ -3162,6 +3167,8 @@ void CDiandanPageUI::StartFulikaShoukuan()
 		{
 			//说明收款成功了，需要进行一些后续的处理
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "fulikazhifu");
+
+			m_pMainWnd->ShowToast(L"收款成功！");
 		}
 
 		m_is_show_modal_wnd = false;
@@ -3215,6 +3222,8 @@ void CDiandanPageUI::StartZidingyiShoukuan(std::wstring name, std::wstring selfp
 		{
 			//说明收款成功了，需要进行一些后续的处理
 			this->StartWorkAfterShoukuan(pShoukuanWnd->m_kucun_string, pShoukuanWnd->m_take_food_code, pShoukuanWnd->m_show_trade_no, "zidingyizhifu");
+
+			m_pMainWnd->ShowToast(L"收款成功！");
 		}
 
 		m_is_show_modal_wnd = false;

zhipuzi_pos_windows/tool/CShuangpingTool.cpp

@@ -52,13 +52,9 @@ void CShuangpingTool::Init()
 			continue;
 		}
 
-		EnumDisplaySettings(dd.DeviceName, 0, &devMode);
-
 		bFlag = EnumDisplaySettings(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devMode);
 		if (bFlag == FALSE)
 		{
-			DWORD a = GetLastError();
-
 			continue;
 		}
 

zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp

@@ -732,6 +732,12 @@ LRESULT CFulikaShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM l
 		std::thread(&CFulikaShoukuanWnd::ReadShoukuanValue, this).detach();
 	}
 
+	Close(IDOK);
+
+	bHandled = TRUE;
+	return 0;
+
+	/*
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_paying_layout")));
 	paying_layout->SetVisible(false);
 
@@ -753,6 +759,7 @@ LRESULT CFulikaShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM l
 
 	bHandled = TRUE;
 	return 0;
+	*/
 }
 
 LRESULT CFulikaShoukuanWnd::OnShoukuanFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

zhipuzi_pos_windows/wnd/CFupingWnd.cpp

@@ -145,22 +145,28 @@ void CFupingWnd::HandleFupingImage()
 {
 	while (true)
 	{
-		std::vector<std::wstring> lunbo_img_paths = CShopinfo::GetInstance()->m_lunbo_img_paths;
-
-		if (lunbo_img_paths.size() == 0)
+		if (CShopinfo::GetInstance()->m_shop_name.size() == 0)
 		{
-			//有可能后台没设置轮播图，有可能还没请求到后台最新数据，等待
-			CSystem::my_sleep(2);
+			//还没登录成功，没拿到店铺名字，等待
+			CSystem::my_sleep(1);
 
 			continue;
 		}
 
-		//走到这里，轮播图数据拿到了，店铺名字数据肯定也拿到了
+		//更新店铺名字
 		CLabelUI* nameControl = static_cast<CLabelUI*>(m_pm.FindControl(L"shopname"));
-
 		std::wstring shopname = CLewaimaiString::UTF8ToUnicode(CShopinfo::GetInstance()->m_shop_name);
 		nameControl->SetText(shopname.c_str());
 
+		std::vector<std::wstring> lunbo_img_paths = CShopinfo::GetInstance()->m_lunbo_img_paths;
+		if (lunbo_img_paths.size() == 0)
+		{
+			//有可能后台没设置轮播图，有可能还没请求到后台最新数据，等待
+			CSystem::my_sleep(2);
+
+			continue;
+		}
+
 		//然后开始处理轮播图
 		if (m_curImageNum > lunbo_img_paths.size() - 1)
 		{

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.cpp

@@ -731,6 +731,12 @@ LRESULT CHuiyuanShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 		std::thread(&CHuiyuanShoukuanWnd::ReadShoukuanValue, this).detach();
 	}
 
+	Close(IDOK);
+
+	bHandled = TRUE;
+	return 0;
+
+	/*
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_paying_layout")));
 	paying_layout->SetVisible(false);
 
@@ -752,6 +758,7 @@ LRESULT CHuiyuanShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 
 	bHandled = TRUE;
 	return 0;
+	*/
 }
 
 LRESULT CHuiyuanShoukuanWnd::OnShoukuanFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp

@@ -402,6 +402,12 @@ LRESULT CWeixinzhifuShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPA
 		std::thread(&CWeixinzhifuShoukuanWnd::ReadShoukuanValue, this).detach();
 	}
 
+	Close(IDOK);
+
+	bHandled = TRUE;
+	return 0;
+
+	/*
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_paying_layout")));
 	paying_layout->SetVisible(false);
 
@@ -445,6 +451,7 @@ LRESULT CWeixinzhifuShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPA
 
 	bHandled = TRUE;
 	return 0;
+	*/
 }
 
 LRESULT CWeixinzhifuShoukuanWnd::OnShoukuanFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp

@@ -567,6 +567,12 @@ LRESULT CXianjinShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 		std::thread(&CXianjinShoukuanWnd::ReadShoukuanValue, this).detach();
 	}
 
+	Close(IDOK);
+
+	bHandled = TRUE;
+	return 0;
+
+	/*
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_paying_layout")));
 	paying_layout->SetVisible(false);
 
@@ -588,6 +594,7 @@ LRESULT CXianjinShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 
 	bHandled = TRUE;
 	return 0;
+	*/
 }
 
 LRESULT CXianjinShoukuanWnd::OnShoukuanFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.cpp

@@ -359,6 +359,12 @@ LRESULT CZidingyiShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 		std::thread(&CZidingyiShoukuanWnd::ReadShoukuanValue, this).detach();
 	}
 
+	Close(IDOK);
+
+	bHandled = TRUE;
+	return 0;
+
+	/*
 	CVerticalLayoutUI* paying_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_paying_layout")));
 	paying_layout->SetVisible(false);
 
@@ -380,6 +386,7 @@ LRESULT CZidingyiShoukuanWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 
 	bHandled = TRUE;
 	return 0;
+	*/
 }
 
 LRESULT CZidingyiShoukuanWnd::OnShoukuanFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)