修复 统计日期错误。
消费记录 增加新类型
This commit is contained in:
1 parent
c6b8d3a83a
commit
0f70b5e37c
4 files changed
+677
-667
No files matched your search
@@ -487,7 +487,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
return UserLogin.GetSignPostData(new
|
||||
{
|
||||
StartDate = query.StartDate.Date,
|
||||
EndDate = query.EndDate.Date,
|
||||
EndDate = query.EndDate,
|
||||
ShopIds = shopIds,
|
||||
GroupType = (int)groupType,
|
||||
});
|
||||
|
||||
@@ -276,11 +276,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
/// <summary>组装查询参数(起止日期已保证先后顺序)</summary>
|
||||
private ShopRevenueStatisticsQuery BuildQuery()
|
||||
{
|
||||
if (StartDate == EndDate)
|
||||
{
|
||||
EndDate = EndDate.AddDays(1).AddSeconds(-1);
|
||||
}
|
||||
else if (StartDate > EndDate)
|
||||
if (StartDate > EndDate)
|
||||
{
|
||||
var temp = StartDate;
|
||||
StartDate = EndDate;
|
||||
@@ -291,7 +287,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
return new ShopRevenueStatisticsQuery
|
||||
{
|
||||
StartDate = StartDate,
|
||||
EndDate = EndDate,
|
||||
EndDate = EndDate.AddDays(1).AddSeconds(-1),
|
||||
ShopIds = BuildSelectedShopIds(),
|
||||
StatPackages = StatPackages,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user