|
@@ -633,8 +633,8 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
while(Start <= DateTime.Now)
|
|
|
{
|
|
|
MerchantAmountSummay query = new MerchantAmountSummayService().Query(Id, Start.ToString("yyyyMMdd"));
|
|
|
- // TotalAmount += query.TradeAmount;
|
|
|
- TotalOrder += query.TradeAmount;
|
|
|
+ TotalAmount += query.TradeAmount;
|
|
|
+ TotalOrder += query.TradeCount;
|
|
|
// TotalUser += query.TotalUser;
|
|
|
// TotalActual += query.TotalActual;
|
|
|
Start = Start.AddDays(1);
|
|
@@ -774,6 +774,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Obj.Add("IsAuth", query.IsAuth); //是否认证
|
|
|
Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
|
|
|
Obj.Add("DiviPercent", set.IsAll == 1 ? 0M : set.DiviPercent);
|
|
|
+ Obj.Add("MinPayMoney", set.MinPayMoney);
|
|
|
return Obj;
|
|
|
}
|
|
|
#endregion
|