Commit 54981cbb authored by liudong1993's avatar liudong1993

分销商基础+佣金是否提完控制

parent 66c9208f
...@@ -198,5 +198,9 @@ namespace Mall.Model.Entity.User ...@@ -198,5 +198,9 @@ namespace Mall.Model.Entity.User
get; get;
set; set;
} }
/// <summary>
/// 佣金是否提完 1是 2否
/// </summary>
public int? IsCommissionResidue { get; set; }
} }
} }
...@@ -66,7 +66,8 @@ namespace Mall.Module.User ...@@ -66,7 +66,8 @@ namespace Mall.Module.User
UpdateDate = DateTime.Now, UpdateDate = DateTime.Now,
UserNotes = "", UserNotes = "",
WithdrawFee = 0, WithdrawFee = 0,
WithdrawWay = Common.Enum.User.DistrbutorWithdrawWayEnum.ZDDK WithdrawWay = Common.Enum.User.DistrbutorWithdrawWayEnum.ZDDK,
IsCommissionResidue = 2
}) > 0; }) > 0;
} }
else { else {
......
...@@ -703,14 +703,15 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -703,14 +703,15 @@ namespace Mall.WebApi.Controllers.MallBase
break; break;
} }
demodel.OneCommission = demodel.OneCommission ?? 0; demodel.OneCommission ??= 0;
demodel.TwoCommission = demodel.TwoCommission ?? 0; demodel.TwoCommission ??= 0;
demodel.ThreeCommission = demodel.ThreeCommission ?? 0; demodel.ThreeCommission ??= 0;
demodel.WithdrawFee = demodel.WithdrawFee ?? 0; demodel.IsCommissionResidue ??= 2;
demodel.MinimumWithdrawalLimit = demodel.MinimumWithdrawalLimit ?? 0; demodel.WithdrawFee ??= 0;
demodel.DailyWithdrawalLimit = demodel.DailyWithdrawalLimit ?? 0; demodel.MinimumWithdrawalLimit ??= 0;
demodel.BackgroundImage = demodel.BackgroundImage ?? 0; demodel.DailyWithdrawalLimit ??= 0;
demodel.IndexImage = demodel.IndexImage ?? 0; demodel.BackgroundImage ??= 0;
demodel.IndexImage ??= 0;
demodel.TenantId = Convert.ToInt32(requestParm.uid); demodel.TenantId = Convert.ToInt32(requestParm.uid);
demodel.MallBaseId = requestParm.MallBaseId; demodel.MallBaseId = requestParm.MallBaseId;
demodel.CreateDate = DateTime.Now; demodel.CreateDate = DateTime.Now;
...@@ -759,6 +760,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -759,6 +760,7 @@ namespace Mall.WebApi.Controllers.MallBase
model.BackgroundImagePath, model.BackgroundImagePath,
model.IndexImage, model.IndexImage,
model.IndexImagePath, model.IndexImagePath,
model.IsCommissionResidue,
UpdateDate = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" UpdateDate = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment