From dcd066fb9d1fbf5a99fe185546364ab33ee72724 Mon Sep 17 00:00:00 2001
From: feng <279202647@qq.com>
Date: Thu, 16 Mar 2023 15:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=94=E4=BB=B7=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/HuiYan/teamitemsController.cs | 2 +-
src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs | 9 +++++++--
src/Coldairarrow.Entity/DTO/TaskInfoDto.cs | 1 +
客户端/齐越慧眼/齐越慧眼/ApiHelper.cs | 3 ++-
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml | 2 +-
.../齐越慧眼/UserControls/ItemControl.xaml.cs | 8 ++++++--
6 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs b/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs
index 182e83d..adaac7f 100644
--- a/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs
+++ b/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs
@@ -122,7 +122,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan
///
///
///
- [HttpGet]
+ [HttpGet,AllowAnonymous]
public AjaxResult GetTjInfo(DateTime start, DateTime end)
{
return _teamitemsBus.GetTjInfo(start,end);
diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
index e8ae54e..a426868 100644
--- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
+++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
@@ -371,6 +371,8 @@ namespace Coldairarrow.Business.HuiYan
var list = await q.Where(where).ToListAsync();
+ list = list.Where(c => !string.IsNullOrEmpty(c.Id)).ToList();
+
var model = new PriceTaskInfo()
{
AuditCount = list.Count(c => c.State == PriceTaskState.已比价),
@@ -395,6 +397,7 @@ namespace Coldairarrow.Business.HuiYan
{
IsPass = b.IsQualified == null ? null : b.IsQualified.Value,
TeamId = b.TeamId,
+ TeamItemId=b.ItemId,
TeamUserId = b.UserId,
TeamDate = b.CreateTime,
TeamOverDate = b.UpdateDate==null?null:b.UpdateDate.Value,
@@ -416,11 +419,12 @@ namespace Coldairarrow.Business.HuiYan
start = new DateTime(start.Year, start.Month, start.Day);
end = new DateTime(end.Year, end.Month, end.Day, 23, 59, 59);
- //where = where.And(c => c.PriceTaskCreateDate >= start && c.PriceTaskCreateDate <= end);
var list = q.Where(where).ToList();
+ list = list.Where(c => !string.IsNullOrEmpty(c.Id)).ToList();
int waitOver = list.Count(c => c.TeamItemState == TeamItemState.已发布比价 && !string.IsNullOrEmpty(c.PriceTaskUserId) && c.State != PriceTaskState.比价完成);
+
int waitCheck = list.Count(c => c.TeamItemState == TeamItemState.已发布比价 && string.IsNullOrEmpty(c.PriceTaskUserId));
@@ -457,7 +461,8 @@ namespace Coldairarrow.Business.HuiYan
list = q3.ToList();
-
+ var passList = list.Where(c => c.IsPass == true).ToList();
+ var overList = list.Where(c => c.State == PriceTaskState.比价完成).ToList();
var jtInfo = new PriceTaskInfo()
{
diff --git a/src/Coldairarrow.Entity/DTO/TaskInfoDto.cs b/src/Coldairarrow.Entity/DTO/TaskInfoDto.cs
index 46963e6..a117e89 100644
--- a/src/Coldairarrow.Entity/DTO/TaskInfoDto.cs
+++ b/src/Coldairarrow.Entity/DTO/TaskInfoDto.cs
@@ -31,6 +31,7 @@ namespace Coldairarrow.Entity.DTO
public string UserName { get; set; }
public DateTime? PriceTaskCreateDate { get; set; }
+
}
public class PriceTaskInfoDto:HuiYan.teamitems
diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
index 584a2dd..9db1c9e 100644
--- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
+++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
@@ -350,8 +350,9 @@ namespace 齐越慧眼
{
HttpClient http = new HttpClient();
http.DefaultRequestHeaders.Add("Cookie", App.JdCookie);
- http.DefaultRequestHeaders.Add("referer", "https://item.jd.com/");
+
http.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36 SE 2.X MetaSr 1.0");
+ http.DefaultRequestHeaders.Add("referer", "https://item.jd.com/");
string url = $"https://api.m.jd.com/api?appid=pc-item-soa&functionId=pc_detailpage_wareBusiness&client=pc&clientVersion=1.0.0&loginType=3&body=%7B%22skuId%22%3A%20%22{skuId}%22%2C%22num%22%3A%201%7D&jsonp=jQuery9509423&_=1678871818560";
html = http.GetStringAsync(url).Result;
diff --git a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
index bbd345b..0c94c5b 100644
--- a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
+++ b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
@@ -11,7 +11,7 @@
WindowStartupLocation="CenterScreen"
ActiveGlowColor="{DynamicResource PrimaryColor}"
Height="780"
- Title="慧眼 V1.0.1.8"
+ Title="慧眼 V1.0.1.9"
Width="1468" Icon="/icon.ico"
>
diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs
index 7602cb2..bb6eee5 100644
--- a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs
@@ -119,13 +119,17 @@ namespace 齐越慧眼.UserControls
public string getItemInfoByUrl(string url)
{
// https://item.jd.com/10030884795783.html
-
+ url = url.Trim();
+ if (url.EndsWith("/"))
+ {
+ url=url.Remove(url.Length - 1,1);
+ }
if (string.IsNullOrEmpty(App.JdCookie))
{
Application.Current.Dispatcher.Invoke(() =>
{
- BrowerTabPanelControl.Main.NewTab("https://passport.jd.com/uc/login?ltype=logout&ReturnUrl=https://item.jd.com/10067296719254.html");
+ BrowerTabPanelControl.Main.NewTab($"https://passport.jd.com/uc/login?ltype=logout&ReturnUrl={url}");
MainWindow.Main.tab.SelectedIndex = 2;
});