调整排序问题

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

@@ -42,7 +42,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Kind = int.Parse(function.CheckInt(data["Kind"].ToString())); //类型(1 支付宝 2 微信)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
-            string condition = " WHERE 1=1";
+            string condition = " WHERE 1=1 ORDER BY UpdateDate DESC";
             string limitString = " LIMIT " + pageSize;
             if (pageNum > 1)
             {
@@ -51,8 +51,6 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             condition += limitString;
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            var aa = "SELECT * FROM(SELECT a.*,b.CertMerchantName FROM(SELECT Id,1 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id UNION ALL SELECT a.*,b.CertMerchantName FROM (SELECT Id,2 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer2.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id)aa" + condition;
-            
             DataTable dt = CustomerSqlConn.dtable("SELECT * FROM(SELECT a.*,b.CertMerchantName FROM(SELECT Id,1 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id UNION ALL SELECT a.*,b.CertMerchantName FROM (SELECT Id,2 Kind,MerchantId,UpdateDate,OrderNo,ConsumerId,PayMoney,CurDivi,Status FROM QrCodePlateMainServer2.ConsumerOrders WHERE ConsumerId IN(SELECT Id FROM QrCodePlateMainServer.Consumers WHERE Id='" + ConsumerId + "') AND Status>0 AND PayMode=" + Kind + ")a LEFT JOIN (SELECT Id,CertMerchantName FROM QrCodePlateMainServer2.MerchantAddInfo WHERE Status=2 OR QueryCount=2)b ON a.MerchantId=b.Id)aa" + condition, AppConfig.Base.SqlConnStr);
             foreach (DataRow dr in dt.Rows)
             {

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

@@ -76,7 +76,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("MerchantShortName", dr["MerchantShortname"].ToString()); //商户简称
                 curData.Add("BusinessName", dr["BusinessName"].ToString()); //经营类型
                 curData.Add("StoreEntrancePic", StoreEntrancePic[0]); //门店门头照片
-                curData.Add("BizStoreAddress", dr["Areas"].ToString() + dr["Address"].ToString()); //门店地址
+                curData.Add("BizStoreAddress", (dr["Areas"].ToString() + dr["Address"].ToString()).Replace(",", "")); //门店地址
                 curData.Add("Popularity", dr["Popularity"].ToString()); //人气值
                 curData.Add("Distance", decimal.Parse(dr["distance"].ToString()).ToString("F2")); //距离
                 dataList.Add(curData);
@@ -123,13 +123,13 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("MerchantShortName", merAddInfo.MerchantShortname); //商户简称
                 Obj.Add("Popularity", merInfo.Popularity); //人气值
                 Obj.Add("BusinessName", BusinessName); //经营类型
-                Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周五 09:00-22:00" : "周一至周五 09:00 - 22:00"); //营业时间
+                Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周日 09:00-22:00" : "周一至周日 09:00 - 22:00"); //营业时间
                 Obj.Add("MerchantMobile", merInfo.Mobile); //商户电话
                 Obj.Add("Introduction", merInfo.BriefIntroduction == null ? "暂无信息" : "暂无信息"); //商户简介
                 Obj.Add("Longitude", merInfo.Longitude); //经度
                 Obj.Add("Latitude", merInfo.Latitude); //纬度
                 Obj.Add("StoreEntrancePic", Atlas[0]); //门店门头照片
-                Obj.Add("BizStoreAddress", merInfo.Areas + merInfo.Address); //门店地址
+                Obj.Add("BizStoreAddress", (merInfo.Areas + merInfo.Address).Replace(",", "")); //门店地址
             }
             if (Kind == 2)
             {
@@ -150,13 +150,13 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("MerchantShortName", merAddInfo.MerchantShortname); //商户简称
                 Obj.Add("Popularity", merInfo.Popularity); //人气值
                 Obj.Add("BusinessName", BusinessName); //经营类型
-                Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周五 09:00-22:00" : "周一至周五 09:00 - 22:00"); //营业时间
+                Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周日 09:00-22:00" : "周一至周日 09:00 - 22:00"); //营业时间
                 Obj.Add("MerchantMobile", merInfo.Mobile); //商户电话
                 Obj.Add("Introduction", merInfo.BriefIntroduction == null ? "暂无信息" : "暂无信息"); //商户简介
                 Obj.Add("Longitude", merInfo.Longitude); //经度
                 Obj.Add("Latitude", merInfo.Latitude); //纬度
                 Obj.Add("StoreEntrancePic", Atlas[0]); //门店门头照片
-                Obj.Add("BizStoreAddress", merInfo.Areas + merInfo.Address); //门店地址
+                Obj.Add("BizStoreAddress", (merInfo.Areas + merInfo.Address).Replace(",", "")); //门店地址
             }
 
             return Obj;