Forráskód Böngészése

补推送直联交易

lcl 4 hónapja
szülő
commit
b332db1330
2 módosított fájl, 63 hozzáadás és 16 törlés
  1. 28 2
      AppStart/PosPushDataNewHelper.cs
  2. 35 14
      Controllers/HomeController.cs

+ 28 - 2
AppStart/PosPushDataNewHelper.cs

@@ -25,11 +25,12 @@ namespace MySystem
                 dataContent.Add("id_card", ""); //商户身份证
                 dataContent.Add("mer_name", mer.MerName); //商户姓名
                 dataContent.Add("mer_mobile", ""); //商户手机号
-                dataContent.Add("request_id", getRequestId(mer.Id, "bind")); //流水号
+                dataContent.Add("request_id", function.MD5_32(mer.MerSnNo + mer.MerNo)); //流水号
                 dataContent.Add("bind_time", mer.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
                 dataContent.Add("brand", int.Parse(function.CheckInt(ProductType))); //品牌
                 if(kind.Contains("好哒二维码"))
                 {
+                    dataContent.Add("user_id", mer.QueryCount);
                     Push("qr_bind", dataContent);
                 }
                 else
@@ -70,7 +71,7 @@ namespace MySystem
         public static void Trade(ConsumerOrders trade, string kind)
         {
             try
-            {
+            {//{"pos_sn":"LKB01231000305000491","mer_no":"","request_id":"2025011015514890534136704","trade_amount":3.0,"trade_time":"2025-01-10 15:51:49","brand":100,"card_type":1,"qr_pay_flag":0,"fee_rate":0.63,"fee_amt":3}
                 int brand = 18;
                 if(kind.Contains("好哒语音王")) brand = 18;
                 if(kind.Contains("收款王M820")) brand = 19;
@@ -105,6 +106,31 @@ namespace MySystem
             }
         }
 
+        public static void Trade(MySystem.MpMainModels.ConsumerOrders trade)
+        {
+            try
+            {
+                int brand = 100;
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", trade.SnNo); //机具sn
+                dataContent.Add("mer_no", trade.TradePayNo); //商户号
+                dataContent.Add("request_id", trade.OrderNo + trade.Id + "1"); //流水号
+                dataContent.Add("trade_amount", trade.PayMoney); //交易金额
+                dataContent.Add("trade_time", trade.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                dataContent.Add("brand", brand); //品牌
+                dataContent.Add("is_act", trade.IsAct); //品牌
+                dataContent.Add("card_type", 1); //卡类型
+                dataContent.Add("qr_pay_flag", 0); //云闪付标记
+                dataContent.Add("fee_rate", trade.IsAct == 1 ? 0.6M : 0.63M); // 费率
+                dataContent.Add("fee_amt", trade.IsAct == 1 ? 0 : 3); // 秒到费
+                Push("trade", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送交易数据异常");
+            }
+        }
+
         public static void Push(string dataType, Dictionary<string, object> dataContent)
         {
             Dictionary<string, object> data = new Dictionary<string, object>();

+ 35 - 14
Controllers/HomeController.cs

@@ -51,28 +51,49 @@ namespace MySystem.Controllers
 
         public string test()
         {
-            MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
-            MpMainModels2.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == 5660) ?? new MpMainModels2.MerchantAddInfo();
+            MpMainModels.WebCMSEntities db = new MpMainModels.WebCMSEntities();
+            // MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
+            List<int> ids = new List<int>();
+            ids.Add(333532);
+            ids.Add(333637);
+            ids.Add(333959);
+            ids.Add(333960);
+            ids.Add(334005);
+            var orders = db.ConsumerOrders.Where(m => ids.Contains(m.Id)).ToList();
+            foreach(var order in orders)
+            {
+                order.TradePayNo = "1648367286_2088641599837899";
+                PosPushDataNewHelper.Trade(order);
+            }
+            // MpMainModels2.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == 5660) ?? new MpMainModels2.MerchantAddInfo();
             
-            SortedList<string, string> obj = new SortedList<string, string>();
+            // SortedList<string, string> obj = new SortedList<string, string>();
+
+            // // obj.Add("create_time", "2024-08-19 15:13:00");
+            // // obj.Add("sn", "000068457494");
+            // // obj.Add("deposit", "399");
+            // // obj.Add("merch_no", merchantadd.MchtNo);
 
             // obj.Add("create_time", "2024-08-19 15:13:00");
             // obj.Add("sn", "000068457494");
-            // obj.Add("deposit", "399");
+            // obj.Add("pay_money", "199");
+            // obj.Add("pay_mode", "1");
+            // obj.Add("order_no", "4545656767878978978");
             // obj.Add("merch_no", merchantadd.MchtNo);
 
-            obj.Add("create_time", "2024-08-19 15:13:00");
-            obj.Add("sn", "000068457494");
-            obj.Add("pay_money", "199");
-            obj.Add("pay_mode", "1");
-            obj.Add("order_no", "4545656767878978978");
-            obj.Add("merch_no", merchantadd.MchtNo);
-
-            obj.Add("maker_code", "C00000001");
-            // PushHelper.Instance.Do(obj, "cashNotify");
-            PushHelper.Instance.Do(obj);
+            // obj.Add("maker_code", "C00000001");
+            // // PushHelper.Instance.Do(obj, "cashNotify");
+            // PushHelper.Instance.Do(obj);
 
             db.Dispose();
+            // PosPushDataNewHelper.Bind(new SpModels.BindRecord()
+            // {
+            //     MerSnNo = "019954101602",
+            //     MerNo = "015460108338120",
+            //     MerName = "海口龙华润兴达百货商行",
+            //     CreateTime = DateTime.Parse("2024-12-09 00:22:03"),
+            //     QueryCount = 247137,
+            // }, "好哒二维码");
             return "ok";
         }