Merge branch 'feat-lcl-推送订单到MQ' of kxs-end/main-server into release-mainserver

AppStart/Helper/BalancePayBackService.cs

@@ -106,6 +106,7 @@ namespace MySystem
                             order.SendStatus = 1;
                             order.SendDate = DateTime.Now;
                             db.SaveChanges();
+                            Utils.Instance.SendMqOrder(order);
                         }
                     }
                 }

AppStart/Tables/MqOrder.cs

@@ -40,10 +40,10 @@ namespace MySystem
         public int payMode { get; set; }
 
         //发货时间
-        public DateTime? sendDate { get; set; }
+        public string sendDate { get; set; }
 
         //支付时间
-        public DateTime? payDate { get; set; }
+        public string payDate { get; set; }
 
         //邮政编码
         public string postalCode { get; set; }

Startup.cs

@@ -177,7 +177,7 @@ namespace MySystem
                 SycnSpTradeService.Instance.StartTradeStatus(); //恢复原始交易没有统计上的数据
                 SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
                 SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
-                SycnSpMerchantRecordService.Instance.Start(); //同步SP商户记录数据
+                SycnSpMerchantRecordService.Instance.Start(); //同步SP商户记录数据 
 
                 StatService.Instance.StartActiveReward(); //实时处理激活奖励
                 StatService.Instance.StartActiveReward1(); //实时处理0押激活奖励

Util/Utils.cs

@@ -291,7 +291,7 @@ namespace MySystem
 
         public void SendMqOrder(Orders order)
         {
-            RedisDbconn.Instance.AddList("KxsOrderQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MqOrder()
+            string data = Newtonsoft.Json.JsonConvert.SerializeObject(new MqOrder()
             {
                 id = order.Id,
                 status = order.Status,
@@ -300,13 +300,13 @@ namespace MySystem
                 remark = order.Remark,
                 buyCount = order.BuyCount,
                 payStatus = order.PayStatus,
-                productId = order.ProductId,
+                productId = order.ProductId, 
                 sendStatus = order.SendStatus,
                 deliveryType = order.DeliveryType,
                 refundStatus = order.RefundStatus,
                 payMode = order.PayMode,
-                sendDate = order.SendDate,
-                payDate = order.PayDate,
+                sendDate = order.SendDate == null ? "" : order.SendDate.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
+                payDate = order.PayDate == null ? "" : order.PayDate.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
                 postalCode = order.PostalCode,
                 address = order.Address,
                 areas = order.Areas,
@@ -316,7 +316,9 @@ namespace MySystem
                 orderNo = order.OrderNo,
                 userId = order.UserId,
                 parentOrderId = order.ParentOrderId,
-            }));
+            });
+            function.WriteLog(DateTime.Now.ToString() + "\n" + data, "订单推送MQ日志");
+            RedisDbconn.Instance.AddList("KxsOrderQueue", data);
         }
 
         #endregion