Quellcode durchsuchen

添加盟主储蓄金变动明细
添加商城订单发货Status为3

DuGuYang vor 3 Jahren
Ursprung
Commit
0beb80ce36

+ 14 - 11
Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoKeyword", "1"); //订单编号
 
 
-            string condition = " and Status>-1 and QueryCount=1";
+            string condition = " and Status>-1";
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -89,18 +89,21 @@ namespace MySystem.Areas.Admin.Controllers
                 //订单信息
                 JsonData ApplyList = JsonMapper.ToObject(dic["SeoTitle"].ToString());//申请数据
                 dic["dPosCoupons"] = "";
-                dic["dPosCoupons"] = "";
-                for (int i = 0; i < ApplyList.Count; i++)
+                dic["bPosCoupons"] = "";
+                if (!string.IsNullOrEmpty(dic["SeoTitle"].ToString()))
                 {
-                    int num = Convert.ToInt32(ApplyList[i]["Num"].ToString());
-                    int type = Convert.ToInt32(ApplyList[i]["Type"].ToString());
-                    if (type == 1)
-                    {
-                        dic["dPosCoupons"] = num + "张";
-                    }
-                    else
+                    for (int i = 0; i < ApplyList.Count; i++)
                     {
-                        dic["bPosCoupons"] = num + "张";
+                        int num = Convert.ToInt32(ApplyList[i]["Num"].ToString());
+                        int type = Convert.ToInt32(ApplyList[i]["Type"].ToString());
+                        if (type == 1)
+                        {
+                            dic["dPosCoupons"] = num + "张";
+                        }
+                        else
+                        {
+                            dic["bPosCoupons"] = num + "张";
+                        }
                     }
                 }
 

+ 5 - 0
Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -510,9 +510,14 @@ namespace MySystem.Areas.Admin.Controllers
             string[] Ids = IdList.TrimEnd('#').Split('#');
             string[] StoreIds = StoreIdList.TrimEnd('#').Split('#');
             string[] SnNoss = SnNosList.TrimEnd('#').Split('#');
+            int[] pIds = new int[] { 42, 41, 21, 20, 19, 18, 17, 16, 14, 13, 12, 9, 8, 7 };
             for (int i = 0; i < Ids.Length; i++)
             {
                 int Id = int.Parse(Ids[i]);
+                if (pIds.Contains(Id))
+                {
+                    Fields.Add("Status", 3);
+                }
                 int StoreId = int.Parse(StoreIds[i]);
                 string SnNos = SnNoss[i];
                 OrderProduct pro = db.OrderProduct.FirstOrDefault(m => m.Id == Id);