Browse Source

商户绑定码牌和音响的时候关联对应的所属人

DuGuYang 1 year ago
parent
commit
a65077237b

+ 4 - 2
Areas/Api/Controllers/Main/MerchantQrCodeController.cs

@@ -105,7 +105,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Models.Main.MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
             int PosId = 0;
             int Kind = 0;
-            if(SnNo == MachineNo)
+            if (SnNo == MachineNo)
             {
                 if (pos.Id == 0)
                 {
@@ -118,7 +118,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 PosId = pos.Id;
                 Kind = 1;
             }
-            else if(SnNo != MachineNo)
+            else if (SnNo != MachineNo)
             {
                 if (machines.Id == 0)
                 {
@@ -197,6 +197,8 @@ namespace MySystem.Areas.Api.Controllers.v1
                     Models.Main1.PosMachines machine = PosMachinesService.Query(" PosSn='" + SnNo + "'");
                     fields = new Dictionary<string, object>();
                     fields.Add("BindingTime", DateTime.Now);
+                    fields.Add("BuyUserId", merchant.UserId);
+                    fields.Add("UserId", merchant.UserId);
                     fields.Add("BindingState", 1);
                     fields.Add("BindMerchantId", MerchantId);
                     // fields.Add("DeviceName", deviceId);

+ 5 - 0
Areas/Api/Controllers/Main/PosMachinesController.cs

@@ -230,12 +230,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             string PosSn = data["PosSn"].ToString(); //SN编号
             int BindMerchantId = int.Parse(function.CheckInt(data["BindMerchantId"].ToString())); //绑定商户
+            Models.Main.MerchantInfo merchant = MerchantInfoService.Query(BindMerchantId);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             PosMachines query = new PosMachines();
             query = new PosMachines()
             {
                 CreateDate = DateTime.Now, //创建时间
                 UpdateDate = DateTime.Now, //修改时间
+                BuyUserId = merchant.UserId, //绑定所属创客Id
+                UserId = merchant.UserId, //绑定所属创客Id
                 PosSn = PosSn, //SN编号
                 BindMerchantId = BindMerchantId, //绑定商户
             };
@@ -272,6 +275,8 @@ namespace MySystem.Areas.Api.Controllers.v1
                     if (machine != null)
                     {
                         machine.BindMerchantId = 0;
+                        machine.BuyUserId = 0;
+                        machine.UserId = 0;
                     }
                 }
             }

+ 4 - 0
Util/PublicFunction.cs

@@ -226,12 +226,16 @@ namespace MySystem
             {
                 Models.Main1.PosMachines pos = db.PosMachines.FirstOrDefault(m => m.PosSn == PosSn) ?? new Models.Main1.PosMachines();
                 pos.BindingState = 1;
+                pos.BuyUserId = UserId;
+                pos.UserId = UserId;
                 pos.BindingTime = DateTime.Now;
             }
             else
             {
                 Models.Main1.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new Models.Main1.PosMachinesTwo();
                 pos.BindingState = 1;
+                pos.BuyUserId = UserId;
+                pos.UserId = UserId;
                 pos.BindingTime = DateTime.Now;
             }
             string IdBrand = UserId + "_" + BrandId;