|
@@ -45,15 +45,15 @@ namespace MySystem
|
|
|
{
|
|
|
if (forMerNo != null)
|
|
|
{
|
|
|
+ // 删除对应商户
|
|
|
+ PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
|
+ if(merchant != null)
|
|
|
+ {
|
|
|
+ db.PosMerchantInfo.Remove(merchant);
|
|
|
+ }
|
|
|
db.MachineForMerNo.Remove(forMerNo);
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
- // 删除对应商户
|
|
|
- PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
|
- if(merchant != null)
|
|
|
- {
|
|
|
- db.PosMerchantInfo.Remove(merchant);
|
|
|
- }
|
|
|
db.MachineUnBind.Add(new PxcModels.MachineUnBind()
|
|
|
{
|
|
|
CreateDate = DateTime.Now,
|