|
@@ -92,8 +92,8 @@ namespace MySystem
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
|
|
|
|
Models.Main1.WebCMSEntities db1 = new Models.Main1.WebCMSEntities();
|
|
Models.Main1.WebCMSEntities db1 = new Models.Main1.WebCMSEntities();
|
|
- Models.Main1.PosMachines machine = db1.PosMachines.FirstOrDefault(m => m.PosSn == order.SnNo);
|
|
|
|
- if(machine != null)
|
|
|
|
|
|
+ var machines = db1.PosMachines.Select(m => new { m.SeoDescription, m.DeviceKind, m.BrandId, m.Detail, m.BindMerchantId }).Where(m => m.DeviceKind == "2" && m.BindMerchantId == order.MerchantId);
|
|
|
|
+ foreach(var machine in machines)
|
|
{
|
|
{
|
|
if(!string.IsNullOrEmpty(addinfo.AliMerchantId) && machine.BrandId == 1)
|
|
if(!string.IsNullOrEmpty(addinfo.AliMerchantId) && machine.BrandId == 1)
|
|
{
|
|
{
|