|
|
@@ -53,6 +53,22 @@ namespace MySystem
|
|
|
{
|
|
|
int UserId = merchant.UserId;
|
|
|
PosMerchantInfo mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
|
|
|
+ string Name = mer.MerchantName;
|
|
|
+ if (mer.BrandId == 2)
|
|
|
+ {
|
|
|
+ if (Name.Contains("-"))
|
|
|
+ {
|
|
|
+ Name = Name.Split('-')[1];
|
|
|
+ }
|
|
|
+ else if (Name.Contains("_"))
|
|
|
+ {
|
|
|
+ Name = Name.Split('_')[1];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ Name = Name.Replace("个体户", "");
|
|
|
+ Name = Name.Replace("个体商户", "");
|
|
|
+ Name = Name.Replace("企业户", "");
|
|
|
+ Name = Name.Replace("企业商户", "");
|
|
|
Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
|
|
|
decimal money = TradeAmount * 0.0005M;
|
|
|
decimal money2 = TradeAmount * 0.00005M;
|
|
|
@@ -79,6 +95,7 @@ namespace MySystem
|
|
|
ChangeAmount = money, //变更金额
|
|
|
BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
|
|
|
AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
|
+ Remark = Name.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmount.ToString("f2"),
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
|
|
|
@@ -105,6 +122,7 @@ namespace MySystem
|
|
|
ChangeAmount = money2, //变更金额
|
|
|
BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
|
|
|
AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
|
+ Remark = Name.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmount.ToString("f2"),
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
|