|
|
@@ -4251,6 +4251,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string RecordId = "";
|
|
|
if (RecordFlag == 1)
|
|
|
{
|
|
|
+ var merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == posInfo.BindMerchantId) ?? new PosMerchantInfo();
|
|
|
decimal ChangeFee = decimal.Parse(Fee);
|
|
|
PosMachinesFeeChangeRecord query = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == posInfo.Id && m.ChangeFee == ChangeFee && m.Status == 0);
|
|
|
if (query == null)
|
|
|
@@ -4266,8 +4267,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
query.MerchantId = posInfo.BindMerchantId;
|
|
|
+ query.MerNo = merchant.KqMerNo;
|
|
|
query.UserId = posInfo.UserId;
|
|
|
query.ChangeFee = ChangeFee;
|
|
|
+ db.SaveChanges();
|
|
|
RecordId = query.Id.ToString();
|
|
|
}
|
|
|
string data = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + posInfo.Id + "\",\"Fee\": \"" + Fee + "\",\"Kind\": \"" + FeeType + "\",\"OpMan\": \"系统\"}";
|