划拨修复

划拨记录调整
音响绑定解绑调整

Areas/Api/Controllers/Main/MerchantQrCodeController.cs

@@ -164,28 +164,26 @@ namespace MySystem.Areas.Api.Controllers.v1
             if(SnNo != MachineNo && !string.IsNullOrEmpty(MachineNo))
             {                
                 //通过sn获取设备号
-                string result = AliIotFunction.Instance.IotDeviceQuery(MachineNo);
-                JsonData jsonObj = JsonMapper.ToObject(result);
-                if(jsonObj["alipay_commerce_iot_device_baseinfo_query_response"]["code"].ToString() == "10000")
-                {
-                    string deviceId = jsonObj["alipay_commerce_iot_device_baseinfo_query_response"]["device_id"].ToString();                    
+                // string result = AliIotFunction.Instance.IotDeviceQuery(MachineNo);
+                // JsonData jsonObj = JsonMapper.ToObject(result);
+                // if(jsonObj["alipay_commerce_iot_device_baseinfo_query_response"]["code"].ToString() == "10000")
+                // {
+                    // string deviceId = jsonObj["alipay_commerce_iot_device_baseinfo_query_response"]["device_id"].ToString();                    
                     Models.Main.MerchantAddInfo addinfo = MerchantAddInfoService.Query(MerchantId);
                     //通过商户smid(好哒认证成功后台提供)绑定支付宝设备
-                    result = AliIotFunction.Instance.IotBind(addinfo.AliMerchantId, deviceId);
-                    jsonObj = JsonMapper.ToObject(result);
+                    var result = AliIotFunction.Instance.IotBind(addinfo.AliMerchantId, MachineNo);
+                    JsonData jsonObj = JsonMapper.ToObject(result);
                     if(jsonObj["alipay_merchant_indirect_iot_bind_response"]["code"].ToString() == "10000")
                     {                        
                         Models.Main1.PosMachines machine = PosMachinesService.Query(" PosSn='" + MachineNo + "'");
                         fields = new Dictionary<string, object>();
-                        fields.Add("BuyUserId", merchant.UserId);
-                        fields.Add("UserId", merchant.UserId);
                         fields.Add("BindingTime", DateTime.Now);
                         fields.Add("BindingState", 1);
                         fields.Add("BindMerchantId", MerchantId);
-                        fields.Add("DeviceName", deviceId);
+                        // fields.Add("DeviceName", deviceId);
                         PosMachinesService.Edit(fields, machine.Id, false);
                     }
-                }
+                // }
             }
 
             PublicFunction.BindUserMachineData(main1db, merchant.UserId, 0, 1, SnNo);
@@ -254,7 +252,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     {
                         Models.Main.MerchantAddInfo addinfo = MerchantAddInfoService.Query(edit.MerchantId);
                         Models.Main1.PosMachines machine = PosMachinesService.Query(" PosSn='" + edit.MachineSnNo + "'");
-                        string result = AliIotFunction.Instance.IotUnBind(addinfo.AliMerchantId, machine.DeviceName);
+                        string result = AliIotFunction.Instance.IotUnBind(addinfo.AliMerchantId, machine.PosSn);
                         JsonData jsonObj = JsonMapper.ToObject(result);
                         if(jsonObj["alipay_merchant_indirect_iot_unbind_response"]["code"].ToString() == "10000")
                         {

Areas/Api/Controllers/Main/PosCouponOrdersController.cs

@@ -162,7 +162,7 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
             Obj.Add("ChangeKind", query.ChangeKind); //变更类型
             Obj.Add("CreateDate", query.CreateDate); //创建时间
             List<int> posids = maindb.PosCouponRecord.Where(m => m.OrderNo == query.OrderNo).ToList().Select(m => m.PosCouponId).ToList();
-            List<string> list = maindb.PosMachinesTwo.Where(m => posids.Contains(m.Id)).ToList().Select(m => m.PosSn).ToList();
+            List<string> list = main1db.PosMachinesTwo.Where(m => posids.Contains(m.Id)).ToList().Select(m => m.PosSn).ToList();
             Obj.Add("SnNoList", list); //机具券列表
             return Obj;
         }
@@ -307,7 +307,7 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
             Obj.Add("ChangeKind", query.ChangeKind); //变更类型
             Obj.Add("CreateDate", query.CreateDate); //创建时间
             List<int> posids = maindb.PosCouponRecord.Where(m => m.OrderNo == query.OrderNo).ToList().Select(m => m.PosCouponId).ToList();
-            List<string> list = maindb.PosMachinesTwo.Where(m => posids.Contains(m.Id)).ToList().Select(m => m.PosSn).ToList();
+            List<string> list = main1db.PosMachines.Where(m => posids.Contains(m.Id)).ToList().Select(m => m.PosSn).ToList();
             Obj.Add("SnNoList", list); //机具券列表
             return Obj;
         }

Areas/Api/Controllers/Main/PosCouponRecordController.cs

@@ -62,7 +62,7 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
                 foreach (string SnId in SnIdList)
                 {
                     int SnIdNum = int.Parse(SnId);
-                    PosMachinesTwo pos = maindb.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum) ?? new PosMachinesTwo();
+                    Models.Main1.PosMachinesTwo pos = main1db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnIdNum) ?? new Models.Main1.PosMachinesTwo();
                     if (pos.BuyUserId != UserId)
                     {
                         return new AppResultJson() { Status = "-1", Info = pos.PosSn + "已划拨，请勿重复划拨", Data = Obj };
@@ -84,6 +84,7 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
                     pos.UserId = ToUserId;
                 }
                 maindb.SaveChanges();
+                main1db.SaveChanges();
                 int SnCount = SnIdList.Length;
                 PosCouponOrders tostat = maindb.PosCouponOrders.Add(new PosCouponOrders()
                 {
@@ -142,7 +143,7 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
                 foreach (string SnId in SnIdList)
                 {
                     int SnIdNum = int.Parse(SnId);
-                    PosMachines pos = maindb.PosMachines.FirstOrDefault(m => m.Id == SnIdNum) ?? new PosMachines();
+                    Models.Main1.PosMachines pos = main1db.PosMachines.FirstOrDefault(m => m.Id == SnIdNum) ?? new Models.Main1.PosMachines();
                     if (pos.BuyUserId != UserId)
                     {
                         return new AppResultJson() { Status = "-1", Info = pos.PosSn + "已划拨，请勿重复划拨", Data = Obj };
@@ -164,6 +165,7 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
                     pos.UserId = ToUserId;
                 }
                 maindb.SaveChanges();
+                main1db.SaveChanges();
                 int SnCount = SnIdList.Length;
                 PosCouponOrders tostat = maindb.PosCouponOrders.Add(new PosCouponOrders()
                 {