1

zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -15,9 +15,9 @@ CZhipuziHttpClient::CZhipuziHttpClient()
 
 	if (m_env == DEV)
 	{
-		m_pingtai_url = "https://pf-api-dev3.zhipuzi.com/pos";
-		m_canyin_yewu_url = "https://cyapi-dev3.zhipuzi.com/pos";
-		m_lingshou_yewu_url = "https://lsapi-dev3.zhipuzi.com/pos";
+		m_pingtai_url = "https://pf-api.zhipuzi.com/pos";
+		m_canyin_yewu_url = "https://cyapi.zhipuzi.com/pos";
+		m_lingshou_yewu_url = "https://lsapi.zhipuzi.com/pos";
 	}
 	else if (m_env == TEST)
 	{

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -240,11 +240,11 @@ std::string CPosPrinterData::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
 
         if(guige == "58")
         {
-            POS_TextOut("商品              单价 数量 金额", false, setting_printer_shangpin_big);
+            POS_TextOut("商品           单价   数量  金额", false, setting_printer_shangpin_big);
         }
         else
         {
-            POS_TextOut("商品                            单价  数量  金额", false, setting_printer_shangpin_big);
+            POS_TextOut("商品                         单价    数量   金额", false, setting_printer_shangpin_big);
         }
 
         POS_FeedLine();
@@ -841,11 +841,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintWaimaiOrderChufang(CWai
             //商品标题
             if(guige == "58")
             {
-                POS_TextOut("商品              单价 数量 金额", false, true);
+                POS_TextOut("商品           单价   数量  金额", false, true);
             }
             else
             {
-                POS_TextOut("商品                            单价  数量  金额", false, true);
+                POS_TextOut("商品                         单价    数量   金额", false, true);
             }
 
             POS_FeedLine();
@@ -993,11 +993,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintWaimaiOrderChufang(CWai
                 //商品标题
                 if(guige == "58")
                 {
-                    POS_TextOut("商品              单价 数量 金额", false, true);
+                    POS_TextOut("商品           单价   数量  金额", false, true);
                 }
                 else
                 {
-                    POS_TextOut("商品                            单价  数量  金额", false, true);
+                    POS_TextOut("商品                         单价    数量   金额", false, true);
                 }
 
                 POS_FeedLine();
@@ -1200,11 +1200,11 @@ std::string CPosPrinterData::PrintDiandanOrderShouyin(CDiandanOrder& order)
 
 		if (guige == "58")
 		{
-			POS_TextOut("商品              单价 数量 金额", false, setting_printer_shangpin_big);
+			POS_TextOut("商品           单价   数量  金额", false, setting_printer_shangpin_big);
 		}
 		else
 		{
-			POS_TextOut("商品                            单价  数量  金额", false, setting_printer_shangpin_big);
+			POS_TextOut("商品                         单价    数量   金额", false, setting_printer_shangpin_big);
 		}
 
 		POS_FeedLine();
@@ -1779,11 +1779,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintDiandanOrderChufang(CDi
 			//商品标题
 			if (guige == "58")
 			{
-				POS_TextOut("商品              单价 数量 金额", false, true);
+				POS_TextOut("商品           单价   数量  金额", false, true);
 			}
 			else
 			{
-				POS_TextOut("商品                            单价  数量  金额", false, true);
+				POS_TextOut("商品                         单价    数量   金额", false, true);
 			}
 
 			POS_FeedLine();
@@ -1923,11 +1923,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintDiandanOrderChufang(CDi
 				//商品标题
 				if (guige == "58")
 				{
-					POS_TextOut("商品              单价 数量 金额", false, true);
+					POS_TextOut("商品           单价   数量  金额", false, true);
 				}
 				else
 				{
-					POS_TextOut("商品                            单价  数量  金额", false, true);
+					POS_TextOut("商品                         单价    数量   金额", false, true);
 				}
 
 				POS_FeedLine();
@@ -2854,6 +2854,8 @@ void CPosPrinterData::CalWord(string s, int& nHanzi, int& nZimu)
 
 /*
  *规格 1：58mm 2:80mm
+ *默认长度 58mm：12 80mm：25
+ *58mm刚好能显示6个汉字每行
  **/
 std::vector<std::string>CPosPrinterData::HandleFoodname(std::string oldname, int guige)
 {
@@ -2865,11 +2867,11 @@ std::vector<std::string>CPosPrinterData::HandleFoodname(std::string oldname, int
 
     if(guige == 1)
     {
-        maxWidth = 15;
+        maxWidth = 12;
     }
     else
     {
-        maxWidth = 28;
+        maxWidth = 25;
     }
 
     if(nWidth <= maxWidth)
@@ -2950,6 +2952,7 @@ std::vector<std::string>CPosPrinterData::HandleFoodname(std::string oldname, int
     return newnameArray;
 }
 
+//默认长度 58mm：7 80mm：8
 std::string CPosPrinterData::HandleFoodItemPrice(std::string oldprice, int guige)
 {
     double price = atof(oldprice.c_str());
@@ -3004,45 +3007,31 @@ std::string CPosPrinterData::HandleFoodItemPrice(std::string oldprice, int guige
     }
 }
 
+//默认长度 58mm：6 80mm：7
 std::string CPosPrinterData::HandleFoodQuantity(std::string oldquantity, int guige)
 {
-    int n = atoi(oldquantity.c_str());
+	size_t length = oldquantity.size();
 
-    if(n < 10)
-    {
-        if(guige == 1)
-        {
-            return "  " + oldquantity;
-        }
-        else
-        {
-            return "   " + oldquantity;
-        }
-    }
-    else if(n >= 10 && n <= 99)
-    {
-        if(guige == 1)
-        {
-            return " " + oldquantity;
-        }
-        else
-        {
-            return "  " + oldquantity;
-        }
-    }
-    else
-    {
-        if(guige == 1)
-        {
-            return "" + oldquantity;
-        }
-        else
-        {
-            return " " + oldquantity;
-        }
-    }
+	size_t kongge_num;
+	if (guige == 1)
+	{
+		kongge_num = 6 - length;
+	}
+	else
+	{
+		kongge_num = 7 - length;
+	}
+
+	std::string newquantity = oldquantity;
+	for (size_t i = 0; i < kongge_num; i++)
+	{
+		newquantity = " " + newquantity;
+	}
+
+	return newquantity;
 }
 
+//默认长度 58mm：7 80mm：8
 std::string CPosPrinterData::HandleFoodTotalPrice(std::string oldprice, int guige)
 {
     double price = atof(oldprice.c_str());