فهرست منبع

广电押金推送修复

lcl 5 ماه پیش
والد
کامیت
0e7dbef840
3فایلهای تغییر یافته به همراه32 افزوده شده و 14 حذف شده
  1. BIN
      .DS_Store
  2. 12 1
      AppStart/Helper/PosPushDataNewHelper.cs
  3. 20 13
      AppStart/Helper/SycnSpServer/SycnSpBindService.cs

BIN
.DS_Store


+ 12 - 1
AppStart/Helper/PosPushDataNewHelper.cs

@@ -138,7 +138,14 @@ namespace MySystem
                 dataContent.Add("pos_sn", act.SnNo); //机具sn
                 dataContent.Add("mer_no", act.MerNo); //商户号
                 dataContent.Add("request_id", getRequestId(act.Id, "deposit")); //流水号
-                dataContent.Add("deposit_amount", TradeAmount); //押金金额
+                if(act.ProductType == "14")
+                {
+                    dataContent.Add("deposit_amount", 0); //押金金额
+                }
+                else
+                {
+                    dataContent.Add("deposit_amount", TradeAmount); //押金金额
+                }
                 dataContent.Add("trade_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
                 dataContent.Add("card_type", 1); //卡类型
                 dataContent.Add("brand", int.Parse(function.CheckInt(act.ProductType))); //品牌
@@ -146,6 +153,10 @@ namespace MySystem
                 {
                     dataContent.Add("act_code", act.Field4); //押金活动编码
                 }
+                else if(act.ProductType == "14")
+                {
+                    dataContent.Add("fee_amt", TradeAmount); //秒到费
+                }
                 Push("deposit", dataContent);
             }
             catch (Exception ex)

+ 20 - 13
AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -111,20 +111,27 @@ namespace MySystem
                             string KindName = Bind.Remark; //商品类型名称
                             string Name = Bind.Field3; //商品名称
                             decimal ActualAmount = decimal.Parse(function.CheckNum(Bind.SeoTitle)); //实付金额
-                            if(ActualAmount > 0)
+                            if(ActualAmount >= 10000) ActualAmount = ActualAmount / 100;
+                            // PosPushDataNewHelper.Trade(new TradeRecord()
+                            // {
+                            //     TradeSnNo = Bind.MerSnNo,
+                            //     MerNo = Bind.MerNo,
+                            //     TradeAmount = 0,
+                            //     TradeSerialNo = function.MD5_16("sim:" + Bind.Id.ToString()),
+                            //     CreateDate = Bind.CreateTime,
+                            //     ProductType = Bind.ProductType,
+                            //     Field1 = Bind.Field3,
+                            //     Field2 = Bind.Field5,
+                            //     ErrorMsg = ActualAmount.ToString(),
+                            // });
+                            PosPushDataNewHelper.Deposit(new ActivateRecord()
                             {
-                                PosPushDataNewHelper.Trade(new TradeRecord()
-                                {
-                                    TradeSnNo = Bind.MerSnNo,
-                                    MerNo = Bind.MerNo,
-                                    TradeAmount = ActualAmount >= 10000 ? ActualAmount / 100 : ActualAmount,
-                                    TradeSerialNo = function.MD5_16("sim:" + Bind.Id.ToString()),
-                                    CreateDate = Bind.CreateTime,
-                                    ProductType = Bind.ProductType,
-                                    Field1 = Bind.Field3,
-                                    Field2 = Bind.Field5,
-                                });
-                            }
+                                SeoTitle = ActualAmount.ToString(),
+                                ProductType = Bind.ProductType,
+                                SnNo = Bind.MerSnNo,
+                                MerNo = Bind.MerNo,
+                                Id = Bind.Id,
+                            });
                             BindRecord edit = spdb.BindRecord.FirstOrDefault(m => m.Id == Bind.Id);
                             if (edit != null)
                             {