修改bug

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

@@ -19,7 +19,7 @@
 					<Label name="name" text="公斤" height="50" width="50" padding="30,0,0,0" align="left"/>
 				</HorizontalLayout>				
 				
-				<Label name="errinfo" text=""  height="60" width="250" float="true" pos="30,150,280,290" align="left" textcolor="#FFFF0000" visible="false"/>
+				<Label name="errinfo" text=""  height="60" width="270" float="true" pos="30,150,300,290" align="left" textcolor="#FFFF0000" visible="false"/>
 				
 				<HorizontalLayout height="56" valign="center" padding="30,100,0,20">
 					<Button name="save" align="center" text="确认" textcolor="#FFFFFFFF" height="50" width="250" padding="0,0,0,0" normalimage="file='Btn_Green.png' corner='5,5,5,5'" hotimage="file='Btn_Green_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -369,21 +369,33 @@ void CDiandanPageUI::InitJiesuanShow()
 	CLabelUI* pYouhuiquanEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_youhuiquan_status")));
 	pYouhuiquanEdit->SetText(L"未使用");
 
+	CButtonUI* pYouhuiquanCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_youhuiquan_btn_cancel")));
+	pYouhuiquanCancel->SetVisible(false);
+
 	//商品券
 	m_is_shangpinquan = false;
 	CLabelUI* pShangpinEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_shangpinquan_status")));
 	pShangpinEdit->SetText(L"未使用");
 
+	CButtonUI* pShangpinquanCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_shangpinquan_btn_cancel")));
+	pShangpinquanCancel->SetVisible(false);
+
 	//次卡
 	m_is_cika = false;
 	CLabelUI* pCikaEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_cika_status")));
 	pCikaEdit->SetText(L"未使用");
 
+	CButtonUI* pCikaCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_cika_btn_cancel")));
+	pCikaCancel->SetVisible(false);
+
 	//权益卡
 	m_is_quanyika = false;
 	CLabelUI* pQuanyikaEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_quanyika_status")));
 	pQuanyikaEdit->SetText(L"未使用");
 
+	CButtonUI* pQuanyikaCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_quanyika_btn_cancel")));
+	pQuanyikaCancel->SetVisible(false);
+
 	//抹零
 	std::string diandan_moling_type = CSetting::GetInstance()->GetParam("diandan_moling_type");
 	m_moling_type = atoi(diandan_moling_type.c_str());
@@ -772,6 +784,22 @@ void CDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 		CPosPrinter printer;
 		printer.OpenQianxiang();
 	}
+	else if (name == L"diandan_jiesuan_youhuiquan_btn_cancel")
+	{
+		this->ClickQuxiaoYouhuiquan();
+	}
+	else if (name == L"diandan_jiesuan_shangpinquan_btn_cancel")
+	{
+		this->ClickQuxiaoShangpinquan();
+	}
+	else if (name == L"diandan_jiesuan_quanyika_btn_cancel")
+	{
+		this->ClickQuxiaoQuanyika();
+	}
+	else if (name == L"diandan_jiesuan_cika_btn_cancel")
+	{
+		this->ClickQuxiaoCika();
+	}
 }
 
 //处理option切换事件
@@ -2486,6 +2514,9 @@ void CDiandanPageUI::ClickSaomaYouhuiquan()
 			CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_youhuiquan_status")));
 			pYouhuiEdit->SetText(L"已使用");
 
+			CButtonUI* pYouhuiquanCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_youhuiquan_btn_cancel")));
+			pYouhuiquanCancel->SetVisible(true);
+
 			this->UpdateJiesuanInfo();
 
 			m_is_show_modal_wnd = false;
@@ -2529,6 +2560,7 @@ void CDiandanPageUI::ClickSaomaShangpinquan()
 			//这说明商品券核销成功了
 			m_is_shangpinquan = true;
 			
+			m_shangpinquan_lewaimai_customer_id = pSaomaShangpinquanDlg->m_lewaimai_customer_id;
 			m_shangpinquan_id = pSaomaShangpinquanDlg->m_goodscoupon_id;
 			m_shangpinquan_name = pSaomaShangpinquanDlg->m_goods_coupon_name;
 			m_shangpinquan_foodid = pSaomaShangpinquanDlg->m_bind_foods_id;
@@ -2536,6 +2568,9 @@ void CDiandanPageUI::ClickSaomaShangpinquan()
 			CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_shangpinquan_status")));
 			pYouhuiEdit->SetText(L"已使用");
 
+			CButtonUI* pShangpinquanCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_shangpinquan_btn_cancel")));
+			pShangpinquanCancel->SetVisible(true);
+
 			this->UpdateJiesuanInfo();
 
 			m_is_show_modal_wnd = false;
@@ -2584,6 +2619,9 @@ void CDiandanPageUI::ClickSaomaQuanyika()
 			CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_quanyika_status")));
 			pYouhuiEdit->SetText(L"已使用");
 
+			CButtonUI* pQuanyikaCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_quanyika_btn_cancel")));
+			pQuanyikaCancel->SetVisible(true);
+
 			this->UpdateJiesuanInfo();
 
 			m_is_show_modal_wnd = false;
@@ -2599,6 +2637,54 @@ void CDiandanPageUI::ClickSaomaQuanyika()
 	}
 }
 
+//点击取消使用优惠券
+void CDiandanPageUI::ClickQuxiaoYouhuiquan()
+{
+	m_is_youhuiquan = false;
+
+	CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_youhuiquan_status")));
+	pYouhuiEdit->SetText(L"未使用");
+
+	CButtonUI* pYouhuiquanCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_youhuiquan_btn_cancel")));
+	pYouhuiquanCancel->SetVisible(false);
+}
+
+//点击取消商品券
+void CDiandanPageUI::ClickQuxiaoShangpinquan()
+{
+	m_is_shangpinquan = false;
+
+	CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_shangpinquan_status")));
+	pYouhuiEdit->SetText(L"未使用");
+
+	CButtonUI* pShangpinquanCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_shangpinquan_btn_cancel")));
+	pShangpinquanCancel->SetVisible(false);
+}
+
+//点击取消权益卡
+void CDiandanPageUI::ClickQuxiaoQuanyika()
+{
+	m_is_quanyika = false;
+
+	CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_quanyika_status")));
+	pYouhuiEdit->SetText(L"未使用");
+
+	CButtonUI* pQuanyikaCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_quanyika_btn_cancel")));
+	pQuanyikaCancel->SetVisible(false);
+}
+
+//点击取消次卡
+void CDiandanPageUI::ClickQuxiaoCika()
+{
+	m_is_cika = false;
+
+	CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_cika_status")));
+	pYouhuiEdit->SetText(L"未使用");
+
+	CButtonUI* pCikaCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_cika_btn_cancel")));
+	pCikaCancel->SetVisible(false);
+}
+
 //点击扫码次卡
 void CDiandanPageUI::ClickSaomaCika()
 {
@@ -2627,6 +2713,7 @@ void CDiandanPageUI::ClickSaomaCika()
 			//这说明商品券核销成功了
 			m_is_cika = true;			
 
+			m_cika_lewaimai_customer_id = pSaomaCikaDlg->m_cika_lewaimai_customer_id;
 			m_cika_id = pSaomaCikaDlg->m_timescoupon_id;
 			m_cika_deduct_type = pSaomaCikaDlg->m_deduct_type;
 			m_cika_discount = pSaomaCikaDlg->m_discount;
@@ -2640,6 +2727,9 @@ void CDiandanPageUI::ClickSaomaCika()
 			CLabelUI* pYouhuiEdit = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_jiesuan_cika_status")));
 			pYouhuiEdit->SetText(L"已使用");
 
+			CButtonUI* pCikaCancel = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_jiesuan_cika_btn_cancel")));
+			pCikaCancel->SetVisible(true);
+
 			this->UpdateJiesuanInfo();
 
 			m_is_show_modal_wnd = false;
@@ -2741,6 +2831,7 @@ std::map<string, string> CDiandanPageUI::GetSendorderParams()
 	if (m_is_cika)
 	{
 		params["timescoupon_id"] = m_cika_id;
+		params["lewaimai_customer_id"] = m_cika_lewaimai_customer_id;
 	}
 
 	if (m_is_shangpinquan)

zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -149,6 +149,18 @@ public:
 	//点击扫码次卡
 	void ClickSaomaCika();
 
+	//点击取消使用优惠券
+	void ClickQuxiaoYouhuiquan();
+
+	//点击取消商品券
+	void ClickQuxiaoShangpinquan();
+
+	//点击取消权益卡
+	void ClickQuxiaoQuanyika();
+
+	//点击取消次卡
+	void ClickQuxiaoCika();
+
 	//点击餐牌号按钮
 	void ClickCanpai();
 
@@ -257,6 +269,7 @@ private:
 
 	//商品券
 	bool m_is_shangpinquan; //是否核销的商品券
+	std::string m_shangpinquan_lewaimai_customer_id;
 	std::string m_shangpinquan_id;
 	std::string m_shangpinquan_name;
 	std::string m_shangpinquan_foodid;
@@ -264,6 +277,7 @@ private:
 
 	//次卡
 	bool m_is_cika;
+	std::string m_cika_lewaimai_customer_id;
 	std::string m_cika_id;
 	std::string m_cika_deduct_type; //次卡优惠类型，0=>折扣，1=>满减，2=>抵扣，3=>指定商品兑换
 	std::string m_cika_discount; //折扣信息

zhipuzi_pos_windows/page/CShangpinCreatePageUI.cpp

@@ -611,7 +611,7 @@ void CShangpinCreatePageUI::HandleSave()
 
 	params["buying_price"] = m_jinhuojia;
 	
-	//这里目前缺少一个进货价模式
+	params["cost_mode"] = to_string(m_jinhuo_type);
 	
 	//哪里显示
 	if (m_is_shouyinji_show)

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -362,6 +362,10 @@ void CShangpinPageUI::StartSearchFood(std::string foodname)
 	CHorizontalLayoutUI* pFoodtype = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("shangpin_fenlei_layout")));
 	pFoodtype->SetVisible(false);
 
+	//隐藏新建分类按钮
+	CHorizontalLayoutUI* pNewType = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("shangpin_page_add_type_layout")));
+	pNewType->SetVisible(false);
+
 	if (m_cur_type_id != "sousuo")
 	{
 		m_type_id_before_sousuo = m_cur_type_id;
@@ -388,6 +392,10 @@ void CShangpinPageUI::StopSerachFood()
 	CHorizontalLayoutUI* pFoodtype = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("shangpin_fenlei_layout")));
 	pFoodtype->SetVisible(true);
 
+	//展示新建分类按钮
+	CHorizontalLayoutUI* pNewType = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("shangpin_page_add_type_layout")));
+	pNewType->SetVisible(true);
+
 	m_cur_type_id = m_type_id_before_sousuo;
 
 	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("shangpin_food_search_tishi")));

zhipuzi_pos_windows/page/CShangpinUpdatePageUI.cpp

@@ -662,7 +662,7 @@ void CShangpinUpdatePageUI::HandleSave()
 
 	params["buying_price"] = m_jinhuojia;
 
-	//这里目前缺少一个进货价模式
+	params["cost_mode"] = to_string(m_jinhuo_type);
 
 	if (m_is_shouyinji_show)
 	{

zhipuzi_pos_windows/wnd/CSaomaCikaWnd.cpp

@@ -233,6 +233,7 @@ void CSaomaCikaWnd::ConfirmMember()
 
 		rapidjson::Value& data = document["data"];
 
+		m_cika_lewaimai_customer_id = data["lewaimai_customer_id"].GetString();
 		m_timescoupon_id = data["timescoupon_id"].GetString();
 		m_timescoupon_name = data["timescoupon_name"].GetString();
 		m_deduct_type = data["deduct_type"].GetString();

zhipuzi_pos_windows/wnd/CSaomaCikaWnd.h

@@ -71,6 +71,8 @@ public:
 
 	std::wstring m_errorInfo;
 
+	std::string m_cika_lewaimai_customer_id;
+
 	std::string m_timescoupon_id;
 	std::string m_timescoupon_name;
 	std::string m_deduct_type;

zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.cpp

@@ -233,6 +233,7 @@ void CSaomaShangpinquanWnd::ConfirmMember()
 
 		rapidjson::Value& data = document["data"];
 
+		m_lewaimai_customer_id = data["info"]["lewaimai_customer_id"].GetString();
 		m_goodscoupon_id = to_string(data["info"]["goodscoupon_id"].GetInt());
 		m_goods_coupon_name = data["info"]["goods_coupon_name"].GetString();
 		m_bind_foods_id = data["info"]["bind_foods_id"].GetString();

zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.h

@@ -71,6 +71,7 @@ public:
 
 	std::wstring m_errorInfo;
 
+	std::string m_lewaimai_customer_id;
 	std::string m_goodscoupon_id;
 	std::string m_goods_coupon_name;
 	std::string m_bind_foods_id;