|
@@ -101,7 +101,7 @@ namespace MySystem
|
|
// AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
// AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
// Remark = Name.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmount.ToString("f2"),
|
|
// Remark = Name.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmount.ToString("f2"),
|
|
// }).Entity;
|
|
// }).Entity;
|
|
- AddProfitRecord(db, user, pos, mer, money, DateTime.Now.AddDays(-1), 1);
|
|
|
|
|
|
+ AddProfitRecord(db, user, pos, mer, TradeAmount, money, DateTime.Now.AddDays(-1), 1);
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
|
|
|
|
// account = db.UserAccount.FirstOrDefault(m => m.Id == user.ParentUserId);
|
|
// account = db.UserAccount.FirstOrDefault(m => m.Id == user.ParentUserId);
|
|
@@ -130,7 +130,7 @@ namespace MySystem
|
|
// AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
// AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
// Remark = Name.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmount.ToString("f2"),
|
|
// Remark = Name.Substring(0, 1) + "**:" + DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + "交易" + TradeAmount.ToString("f2"),
|
|
// }).Entity;
|
|
// }).Entity;
|
|
- AddProfitRecord(db, puser, pos, mer, money, DateTime.Now.AddDays(-1), 112);
|
|
|
|
|
|
+ AddProfitRecord(db, puser, pos, mer, TradeAmount, money, DateTime.Now.AddDays(-1), 112);
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
|
|
|
|
// string Month = Date.Substring(0, 6);
|
|
// string Month = Date.Substring(0, 6);
|
|
@@ -165,7 +165,7 @@ namespace MySystem
|
|
db.Dispose();
|
|
db.Dispose();
|
|
}
|
|
}
|
|
|
|
|
|
- private void AddProfitRecord(WebCMSEntities db, Users puser, PosMachinesTwo pos, PosMerchantInfo merchant, decimal Prize, DateTime yesterday, int RewardType)
|
|
|
|
|
|
+ private void AddProfitRecord(WebCMSEntities db, Users puser, PosMachinesTwo pos, PosMerchantInfo merchant, decimal TradeAmount, decimal Prize, DateTime yesterday, int RewardType)
|
|
{
|
|
{
|
|
string RewardDesc = "助利宝分润";
|
|
string RewardDesc = "助利宝分润";
|
|
if(RewardType == 112)
|
|
if(RewardType == 112)
|
|
@@ -191,8 +191,7 @@ namespace MySystem
|
|
MerBuddyType = puser.MerchantType, //商户创客类型
|
|
MerBuddyType = puser.MerchantType, //商户创客类型
|
|
RewardType = RewardType, //奖励类型
|
|
RewardType = RewardType, //奖励类型
|
|
RewardTips = RewardDesc, //奖励描述
|
|
RewardTips = RewardDesc, //奖励描述
|
|
- CreditTradeAmt = pos.CreditTrade, //贷记卡交易总金额
|
|
|
|
- DebitTradeAmt = pos.DebitCardTrade, //借记卡交易总金额
|
|
|
|
|
|
+ CreditTradeAmt = TradeAmount, //贷记卡交易总金额
|
|
CreditRewardAmount = Prize, //贷记卡交易奖励金额
|
|
CreditRewardAmount = Prize, //贷记卡交易奖励金额
|
|
RewardDesc = RewardDesc, //奖励描述
|
|
RewardDesc = RewardDesc, //奖励描述
|
|
}).Entity;
|
|
}).Entity;
|
|
@@ -205,8 +204,7 @@ namespace MySystem
|
|
UserId = puser.Id, //创客
|
|
UserId = puser.Id, //创客
|
|
BrandId = pos.BrandId, //品牌
|
|
BrandId = pos.BrandId, //品牌
|
|
RewardType = RewardType, //奖励类型
|
|
RewardType = RewardType, //奖励类型
|
|
- CreditTradeAmt = pos.CreditTrade, //贷记卡交易总金额
|
|
|
|
- DebitTradeAmt = pos.DebitCardTrade, //借记卡交易总金额
|
|
|
|
|
|
+ CreditTradeAmt = TradeAmount, //贷记卡交易总金额
|
|
CreditRewardAmount = Prize, //贷记卡交易奖励金额
|
|
CreditRewardAmount = Prize, //贷记卡交易奖励金额
|
|
RewardDesc = RewardDesc, //奖励描述
|
|
RewardDesc = RewardDesc, //奖励描述
|
|
});
|
|
});
|