调整支付订单号

调整激活时间取值
修复支付订单查询问题

Areas/Api/Controllers/v1/MainServer/MerchantDepositOrderController.cs

@@ -82,7 +82,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantInfo merchant = new MerchantInfoService().Query(MerchantId);
-            string OrderNo = "ZLJH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            string OrderNo = "D" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
             string check = RedisDbconn.Instance.Get<string>("ConfirmOrder:" + MerchantId + "_" + OrderNo);
             if (!string.IsNullOrEmpty(check))
             {

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -246,7 +246,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 {
                     IsPay = 1;
                     Obj.Add("IsPay", IsPay); //是否缴纳服务费(0 否 1 是)
-                    Obj.Add("ActDate", orderInfo.CreateDate); //激活时间
+                    Obj.Add("ActDate", orderInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 }
                 else
                 {

Util/MerchantAmountSummayUtil.cs

@@ -27,7 +27,7 @@ namespace MySystem
             if (query.Id > 0)
             {
                 IsJoin = 1;
-                var month = DateTime.Parse(query.CreateDate.ToString());
+                var month = DateTime.Parse(query.UpdateDate.ToString());
                 var TradeMonth = "";
                 decimal TradeAmount = 0.00M;
                 Dictionary<string, string> dic = new Dictionary<string, string>();