调整支付订单号

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

Areas/Api/Controllers/Main/MerchantDepositOrderController.cs

@@ -80,7 +80,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 = MerchantInfoService.Query(MerchantId);
-            string OrderNo = "YLJH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            string OrderNo = "U" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
             string check = RedisDbconn.Instance.Get<string>("ConfirmOrder:" + MerchantId + "_" + OrderNo);
             if (!string.IsNullOrEmpty(check))
             {

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -355,13 +355,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("IsAct", merchant.IsAct); //是否激活(0 否 1 是)
             if (merchant.IsAct == 1)
             {
-                var orderInfo = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + Id + "");
+                var orderInfo = MerchantDepositOrderService.Query(" 1=1 and Status=1 and MerchantId=" + Id + "");
                 var IsPay = 0;
                 if (orderInfo.Id > 0)
                 {
                     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/Main/MerchantAmountSummayUtil.cs

@@ -21,13 +21,13 @@ namespace MySystem
         public static List<Dictionary<string, object>> ListDo(int MerchantId, int PageSize, int PageNum)
         {
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + MerchantId + "");
+            var query = MerchantDepositOrderService.Query(" 1=1 and Status=1 and MerchantId=" + MerchantId + "");
             var Status = 0;//活动交易状态
             var IsJoin = 0;//是否参加活动(0 否 1 是)
             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>();