|
@@ -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, TradeAmount, money, Month, 1);
|
|
|
|
|
|
+ AddProfitRecord(db, user, pos, mer, TradeAmount, money, TradeDate, 1);
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
|
|
|
|
// account = db.UserAccount.FirstOrDefault(m => m.Id == user.ParentUserId);
|
|
// account = db.UserAccount.FirstOrDefault(m => m.Id == user.ParentUserId);
|
|
@@ -136,10 +136,10 @@ namespace MySystem
|
|
Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId);
|
|
Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId);
|
|
if(puser != null)
|
|
if(puser != null)
|
|
{
|
|
{
|
|
- bool op = db.Orders.Any(m => m.Status > 0 && m.ProductId == 30);
|
|
|
|
|
|
+ bool op = db.Orders.Any(m => m.Status > 0 && m.ProductId == 34);
|
|
if(op)
|
|
if(op)
|
|
{
|
|
{
|
|
- AddProfitRecord(db, puser, pos, mer, TradeAmount, money, Month, 112);
|
|
|
|
|
|
+ AddProfitRecord(db, puser, pos, mer, TradeAmount, money2, TradeDate, 112);
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
ParentUserId = 0;
|
|
ParentUserId = 0;
|
|
}
|
|
}
|
|
@@ -188,6 +188,10 @@ namespace MySystem
|
|
|
|
|
|
private void AddProfitRecord(WebCMSEntities db, Users puser, PosMachinesTwo pos, PosMerchantInfo merchant, decimal TradeAmount, decimal Prize, string TradeDate, int RewardType)
|
|
private void AddProfitRecord(WebCMSEntities db, Users puser, PosMachinesTwo pos, PosMerchantInfo merchant, decimal TradeAmount, decimal Prize, string TradeDate, int RewardType)
|
|
{
|
|
{
|
|
|
|
+ if(Prize == 0)
|
|
|
|
+ {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
string RewardDesc = "助利宝分润";
|
|
string RewardDesc = "助利宝分润";
|
|
if(RewardType == 112)
|
|
if(RewardType == 112)
|
|
{
|
|
{
|