Просмотр исходного кода

创建仓库无编号的问题

lichunlei 3 лет назад
Родитель
Сommit
8d5ee9933d

+ 2 - 0
Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -105,6 +105,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
+            // TODO: 读取太慢,要优化
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitRewardRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
@@ -176,6 +177,7 @@ namespace MySystem.Areas.Admin.Controllers
             string CreditTradeAmount = "0.00";//贷记卡交易总金额
             string MerchantProfitAmount = "0.00";//商户交易分润总金额
             string CreditProfitAmount = "0.00";//贷记卡分润总金额
+            // TODO: 读取太慢,要优化
             // DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
             // if (dt.Rows.Count > 0)
             // {

+ 24 - 8
Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -271,11 +271,19 @@ namespace MySystem.Areas.Admin.Controllers
                         });
                         RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
                     }
-                    db.StoreForName.Add(new StoreForName()
+                    StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
+                    if(storeForName == null)
                     {
-                        Name = data.StoreName + "-" + pro.Name,
-                        StoreId = Id,
-                    });
+                        db.StoreForName.Add(new StoreForName()
+                        {
+                            Name = data.StoreName,
+                            StoreId = Id,
+                        });
+                    }
+                    else
+                    {
+                        storeForName.StoreId = Id;
+                    }
                     UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
                     if (account == null)
                     {
@@ -467,11 +475,19 @@ namespace MySystem.Areas.Admin.Controllers
                 });
                 RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
             }
-            db.StoreForName.Add(new StoreForName()
+            StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
+            if(storeForName == null)
             {
-                Name = data.StoreName,
-                StoreId = Id,
-            });
+                db.StoreForName.Add(new StoreForName()
+                {
+                    Name = data.StoreName,
+                    StoreId = Id,
+                });
+            }
+            else
+            {
+                storeForName.StoreId = Id;
+            }
             RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
             AddSysLog(data.Id.ToString(), "StoreHouse", "add");
             db.SaveChanges();