优化

zhipuzi_pos_windows/page/CHuiyuanPageUI.cpp

@@ -227,7 +227,8 @@ void CHuiyuanPageUI::StartHuiyuanChongzhi()
 		UINT ret = pShoukuanWnd->ShowModal();
 		if (ret == IDOK)
 		{
-			
+			//这个表示充值成功了，这个时候刷新会员信息
+			StartHuiyuanSousuo();
 		}
 
 		m_is_show_modal_wnd = false;

zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.cpp

@@ -691,6 +691,8 @@ LRESULT CHuiyuanChongzhiWnd::OnShoukuanNeedPassword(UINT uMsg, WPARAM wParam, LP
 
 LRESULT CHuiyuanChongzhiWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
+	m_is_start_saoma = false;
+
 	//播放充值成功的金额
 	if (CSetting::GetParam("setting_is_new_diannei_voice") == "1")
 	{
@@ -722,6 +724,8 @@ LRESULT CHuiyuanChongzhiWnd::OnShoukuanSuccess(UINT uMsg, WPARAM wParam, LPARAM
 
 LRESULT CHuiyuanChongzhiWnd::OnShoukuanFail(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
+	m_is_start_saoma = false;
+
 	wstring path = CSystem::GetProgramDir() + L"\\music\\pay_fail.wav";
 
 	if (CSetting::GetParam("setting_is_new_diannei_voice") == "1")
@@ -796,6 +800,9 @@ void CHuiyuanChongzhiWnd::StartShoukuan()
 
 		CVerticalLayoutUI* tishi_layout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("shoukuan_tishi_layout")));
 		tishi_layout->SetVisible(true);
+
+		//进入扫码状态
+		m_is_start_saoma = true;
 	}
 	else
 	{
@@ -990,7 +997,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 		//支付失败
 		m_shoukuan_status = 4;
 
-		m_fail_message = CLewaimaiString::UTF8ToUnicode(data["message"].GetString());
+		m_fail_message = CLewaimaiString::UTF8ToUnicode(data_2["message"].GetString());
 
 		SendMessage(WM_SHOUKUAN_STATUS_FAIL, 0, 0);
 	}
@@ -998,7 +1005,7 @@ void CHuiyuanChongzhiWnd::HandleShoukuan()
 	{
 		m_shoukuan_status = 2;
 
-		m_trade_no = data["trade_no"].GetString();
+		m_trade_no = data_2["trade_no"].GetString();
 
 		//需要查询支付状态
 		SendMessage(WM_SHOUKUAN_STATUS_NEEDPASSWORD, 0, 0);
@@ -1238,7 +1245,7 @@ void CHuiyuanChongzhiWnd::HandleTextCapture(std::string content)
 {
 	m_fukuanma = content;
 
-	if (m_shoukuan_status == 0)
+	if (m_shoukuan_status == 0 && m_is_start_saoma == true)
 	{
 		m_shoukuan_status = 1;
 

zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.h

@@ -96,6 +96,7 @@ public:
 	//当前会员的会员卡号
 	std::string m_member_card_no;
 
+	//本次会员充值和赠送的金额
 	std::string m_chongzhi;
 	std::string m_zengsong;
 
@@ -111,6 +112,9 @@ public:
 
 	int m_shoukuan_type = 1; //1 微信支付
 
+	//微信支付时，是否进入到扫码状态
+	bool m_is_start_saoma = false;
+
 	//微信支付时候的付款码
 	std::string m_fukuanma;