回写报表添加票数字段

ChuPiao.AutoPrint.Machine/TjJingCaiV1/MacReport/MacReportService.cs

@@ -688,15 +688,19 @@ namespace ChuPiao.AutoPrint.Machine.TjJingCaiV1.MacReport
                 decodeMachineReport.MachineReportEntity.R_EncashMoney = decimal.Parse(strTemp);
             }
 
-            //如果是竞彩时段报表，解析退票
-            regex = new Regex(@"实退(:|：)\s{0,}\d{1,}\.\d{2}元");
+            //解析退票
+            regex = new Regex(@"实退(:|：)\s{0,}(\d{1,}\.\d{2})元\s{0,}(\d{1,})");
             match = regex.Match(inputTemp);
             if (match.Success)
             {
-                strTemp = Regex.Replace(regex.Match(inputTemp).Value, @"实退(:|：)\s{0,}", "");
-                strTemp = Regex.Replace(strTemp, "元", "");
-
-                decodeMachineReport.MachineReportEntity.R_ReturnMoney = decimal.Parse(strTemp);
+                decodeMachineReport.MachineReportEntity.R_ReturnMoney = decimal.Parse(match.Groups[2].Value);
+                decodeMachineReport.MachineReportEntity.R_ReturnTicket = int.Parse(match.Groups[3].Value);
+            }
+            else
+            {
+                decodeMachineReport.ErrorMessage += "没有获取到退票数据";
+                decodeMachineReport.DecodeSuccess = false;
+                return;
             }
 
             regex = new Regex(@"报表查询时间(:|：)\s{0,}\d{4}-\d{2}-\d{2}\s{0,}\d{2}:\d{2}:\d{2}");

ChuPiao.AutoPrint.Machine/TjJingCaiV1/VirtualPrinter.cs

@@ -685,8 +685,11 @@ namespace ChuPiao.AutoPrint.Machine.TjJingCaiV1
                                         pack.AgentId = MachineInfo.M_Number;
                                         pack.Salt = LotMachine.MachineInfo.M_Salt;
                                         pack.SaleMoney = decodeMachineReport.MachineReportEntity.R_SaleMoney;
+                                        pack.SaleNum = decodeMachineReport.MachineReportEntity.R_SaleTicket;
                                         pack.EncashMoney = decodeMachineReport.MachineReportEntity.R_EncashMoney;
+                                        pack.EncashNum = decodeMachineReport.MachineReportEntity.R_EncashTicket;
                                         pack.ReturnMoney = decodeMachineReport.MachineReportEntity.R_ReturnMoney;
+                                        pack.ReturnNum = decodeMachineReport.MachineReportEntity.R_ReturnTicket;
                                         pack.QueryTime = decodeMachineReport.MachineReportEntity.R_QueryTime.ToString("yyyyMMddHHmmss");
                                         pack.From = decodeMachineReport.MachineReportEntity.R_StartTime.ToString("yyyyMMdd");
                                         pack.To = decodeMachineReport.MachineReportEntity.R_EndTime.ToString("yyyyMMdd");

ChuPiao.AutoPrint/Services/AutoPrint/AutoPrintService.cs

@@ -2697,8 +2697,11 @@ namespace ChuPiao.AutoPrint.Services.AutoPrint
                 pack.Salt = LotMachine.MachineInfo.M_Salt;
 
                 pack.SaleMoney = decodeMachineReport.MachineReportEntity.R_SaleMoney;
+                pack.SaleNum = decodeMachineReport.MachineReportEntity.R_SaleTicket;
                 pack.EncashMoney = decodeMachineReport.MachineReportEntity.R_EncashMoney;
+                pack.EncashNum = decodeMachineReport.MachineReportEntity.R_EncashTicket;
                 pack.ReturnMoney = decodeMachineReport.MachineReportEntity.R_ReturnMoney;
+                pack.ReturnNum = decodeMachineReport.MachineReportEntity.R_ReturnTicket;
                 pack.QueryTime = decodeMachineReport.MachineReportEntity.R_QueryTime.ToString("yyyyMMddHHmmss");
                 pack.From = decodeMachineReport.MachineReportEntity.R_StartTime.ToString("yyyyMMdd");
                 pack.To = decodeMachineReport.MachineReportEntity.R_EndTime.ToString("yyyyMMdd");

ChuPiao.Common/Communication/GtdJson/Packs/A10005UploadMachineSale.cs

@@ -15,10 +15,16 @@ namespace ChuPiao.Common.Communication.GtdJson.Packs
         {
             jsonWriter.WritePropertyName("salemoney");
             jsonWriter.WriteValue(SaleMoney);
+            jsonWriter.WritePropertyName("salenum");
+            jsonWriter.WriteValue(SaleNum);
             jsonWriter.WritePropertyName("encashmoney");
             jsonWriter.WriteValue(EncashMoney);
+            jsonWriter.WritePropertyName("encashnum");
+            jsonWriter.WriteValue(EncashNum);
             jsonWriter.WritePropertyName("returnmoney");
             jsonWriter.WriteValue(ReturnMoney);
+            jsonWriter.WritePropertyName("returnnum");
+            jsonWriter.WriteValue(ReturnNum);
             jsonWriter.WritePropertyName("querytime");
             jsonWriter.WriteValue(QueryTime);
             jsonWriter.WritePropertyName("type");
@@ -33,6 +39,36 @@ namespace ChuPiao.Common.Communication.GtdJson.Packs
             jsonWriter.WriteValue(Prntext);
         }
 
+        private int _salenum;
+        /// <summary>
+        /// 销售
+        /// </summary>
+        public int SaleNum
+        {
+            get { return _salenum; }
+            set { _salenum = value; }
+        }
+
+        private int _encashnum;
+        /// <summary>
+        /// 兑奖
+        /// </summary>
+        public int EncashNum
+        {
+            get { return _encashnum; }
+            set { _encashnum = value; }
+        }
+
+        private int _returnnum;
+        /// <summary>
+        /// 退票金额，竞彩由于场次取消而产生的单关票，会在兑奖时按退票处理，不计算佣金
+        /// </summary>
+        public int ReturnNum
+        {
+            get { return _returnnum; }
+            set { _returnnum = value; }
+        }
+
         private decimal _salemoney;
         /// <summary>
         /// 销售

ChuPiao.Common/Models/R_MachineReportEntity.cs

@@ -23,6 +23,7 @@ namespace ChuPiao.Common.Models
         private string _r_prntext = "";
 
         private decimal _r_returnmoney = 0;
+        private int _r_returnticket = 0;
         /// <summary>
         /// 主键ID
         /// </summary>
@@ -113,6 +114,12 @@ namespace ChuPiao.Common.Models
             set { _r_returnmoney = value; }
         }
 
+        public int R_ReturnTicket
+        {
+            get { return _r_returnticket; }
+            set { _r_returnticket = value; }
+        }
+
         #endregion Model