xiaofeng
/
JDHY
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加重复点击同时删除产品库

master
С·æ 4 years ago
parent
9d8e67ee57
commit
1e6c9efc0b
10 changed files with 194 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Coldairarrow.Api/appsettings.json
  2. 45
      src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs
  3. 11
      src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
  4. 2
      src/Coldairarrow.IBusiness/HuiYan/IteamitemsBusiness.cs
  5. 15
      客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
  6. 1
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
  7. 104
      客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
  8. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  9. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
  10. 1
      客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

2
src/Coldairarrow.Api/appsettings.json
View File

@ -43,7 +43,7 @@
//"DatabaseType": "PostgreSql", //"DatabaseType": "PostgreSql",
//"ConnectionString": "Server=127.0.0.1;Port=5432;Database=Colder.Admin.AntdVue;User Id=postgres;Password=postgres;" //"ConnectionString": "Server=127.0.0.1;Port=5432;Database=Colder.Admin.AntdVue;User Id=postgres;Password=postgres;"
"DatabaseType": "MySql", "DatabaseType": "MySql",
"ConnectionString": "server=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;user id=qyroot;password=kaicn1132+-;persistsecurityinfo=True;database=jdhy;SslMode=none;AllowLoadLocalInfile=true" "ConnectionString": "server=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;user id=qyroot;password=kaicn1132+-;persistsecurityinfo=True;database=jdhy;SslMode=none;AllowLoadLocalInfile=true;ConvertZeroDateTime=True"
//"DatabaseType": "Oracle", //"DatabaseType": "Oracle",
//"ConnectionString": "Data Source=127.0.0.1/ORCL;User ID=COLDER.ADMIN.ANTDVUE;Password=123456;Connect Timeout=3" //"ConnectionString": "Data Source=127.0.0.1/ORCL;User ID=COLDER.ADMIN.ANTDVUE;Password=123456;Connect Timeout=3"
} }

45
src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs
View File

@ -145,6 +145,8 @@ namespace Coldairarrow.Business.HuiYan
var label = GetIQueryable().FirstOrDefault(where); var label = GetIQueryable().FirstOrDefault(where);
bool isCanel = false;
var result = Db.RunTransaction(() => var result = Db.RunTransaction(() =>
{ {
int row = 0; int row = 0;
@ -187,7 +189,6 @@ namespace Coldairarrow.Business.HuiYan
else else
{ {
hasAdded = label.IsAdded; hasAdded = label.IsAdded;
//更新状态 //更新状态
row = Db.Update<itemlabels>(c => c.Id == label.Id, (data) => row = Db.Update<itemlabels>(c => c.Id == label.Id, (data) =>
{ {
@ -196,22 +197,46 @@ namespace Coldairarrow.Business.HuiYan
case ItemLabelStatus.Screening: case ItemLabelStatus.Screening:
if (label.IsFilter) if (label.IsFilter)
throw new Exception("该商品已被过滤！"); throw new Exception("该商品已被过滤！");
if (data.IsScreening)
{
data.IsScreening = false;
isCanel = true;
}
else
data.IsScreening = true; data.IsScreening = true;
break; break;
case ItemLabelStatus.Filter: case ItemLabelStatus.Filter:
if (label.IsScreening) if (label.IsScreening)
throw new Exception("该商品已被筛选！"); throw new Exception("该商品已被筛选！");
if (data.IsFilter)
{
data.IsFilter = false;
isCanel = true;
}
else
data.IsFilter = true; data.IsFilter = true;
break; break;
case ItemLabelStatus.Added: case ItemLabelStatus.Added:
//加入产品库同时也勾选筛选 //加入产品库同时也勾选筛选
if (data.IsAdded) {
data.IsAdded = false;
isCanel = true;
}
else
data.IsAdded = true; data.IsAdded = true;
break; break;
case ItemLabelStatus.Competing: case ItemLabelStatus.Competing:
if (data.IsCompeting) {
data.IsCompeting = false;
isCanel = true;
}
else
data.IsCompeting = true; data.IsCompeting = true;
break; break;
} }
}); });
if (row <= 0) if (row <= 0)
throw new Exception("标签设置失败！"); throw new Exception("标签设置失败！");
} }
@ -239,10 +264,16 @@ namespace Coldairarrow.Business.HuiYan
throw new Exception("添加产品库失败！"); throw new Exception("添加产品库失败！");
} }
} }
//删除产品库
if (model.Status == ItemLabelStatus.Added && isCanel)
{
iteamitemsBusiness.RemoveItem(model.ItemId);
}
}); });
if (result.Success) if (result.Success)
return Success("操作成功！"); return Success(new { isCanel },"操作成功！");
return Error(result.ex.Message); return Error(result.ex.Message);
} }
@ -253,11 +284,17 @@ namespace Coldairarrow.Business.HuiYan
/// <returns></returns> /// <returns></returns>
public AjaxResult SetAlbbCooperation(string shopId) public AjaxResult SetAlbbCooperation(string shopId)
{ {
bool isCanel = false;
int count= Db.GetIQueryable<albbitemlabels>().Count(c => c.ShopId == shopId); int count= Db.GetIQueryable<albbitemlabels>().Count(c => c.ShopId == shopId);
if (count > 0) if (count > 0)
{ {
return Error("已存在相同的合作店铺！"); isCanel = true;
Db.Delete<albbitemlabels>(c => c.ShopId == shopId);
return Success(new { isCanel });
} }
int row= Db.Insert<albbitemlabels>(new albbitemlabels() int row= Db.Insert<albbitemlabels>(new albbitemlabels()
@ -270,7 +307,7 @@ namespace Coldairarrow.Business.HuiYan
}); });
if (row > 0) if (row > 0)
return Success(); return Success(new { isCanel });
else else
{ {
return Error(); return Error();

11
src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
View File

@ -160,6 +160,17 @@ namespace Coldairarrow.Business.HuiYan
return Success(); return Success();
} }
public AjaxResult RemoveItem(string goodsId)
{
var item = Db.GetIQueryable<items>().FirstOrDefault(c => c.GoodsId == goodsId);
int row= Db.Delete<teamitems>(c => c.ItemId == item.Id && c.TeamId == _operator.TeamId);
if (row > 0)
return Success();
return Error();
}
public AjaxResult SetItem(TeamitemDto model) public AjaxResult SetItem(TeamitemDto model)
{ {
if (!string.IsNullOrEmpty(model.RivalGoodsId)) if (!string.IsNullOrEmpty(model.RivalGoodsId))

2
src/Coldairarrow.IBusiness/HuiYan/IteamitemsBusiness.cs
View File

@ -18,7 +18,7 @@ namespace Coldairarrow.Business.HuiYan
AjaxResult AddItem(TeamitemDto model); AjaxResult AddItem(TeamitemDto model);
AjaxResult RemoveItem(string goodsId);
AjaxResult SetItem(TeamitemDto model); AjaxResult SetItem(TeamitemDto model);
AjaxResult SetState(string id, int state); AjaxResult SetState(string id, int state);
} }

15
客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
View File

@ -10,8 +10,8 @@ namespace 齐越慧眼
{ {
public class ApiHelper public class ApiHelper
{ {
//public static string ApiBase { get; set; } = "http://localhost:5000"; public static string ApiBase { get; set; } = "http://localhost:5000";
public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; //public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
public static string JwtToken { get; set; } public static string JwtToken { get; set; }
@ -55,15 +55,15 @@ namespace 齐越慧眼
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public static (bool isOk,string msg) SetItemLabel(ItemLabelDto model) public static (bool isOk,bool isCanel,string msg) SetItemLabel(ItemLabelDto model)
{ {
var result= Http("/HuiYan/itemlabels/SetItemLabel", Newtonsoft.Json.JsonConvert.SerializeObject(model)); var result= Http("/HuiYan/itemlabels/SetItemLabel", Newtonsoft.Json.JsonConvert.SerializeObject(model));
var data = Newtonsoft.Json.JsonConvert.DeserializeObject<dynamic>(result); var data = Newtonsoft.Json.JsonConvert.DeserializeObject<dynamic>(result);
bool isSuccess = data.Success; bool isSuccess = data.Success;
bool isCanel = data.Data.isCanel;
return (isSuccess, data.Msg ?? ""); return (isSuccess, isCanel, data.Msg ?? "");
} }
/// <summary> /// <summary>
@ -71,15 +71,16 @@ namespace 齐越慧眼
/// </summary> /// </summary>
/// <param name="shopId"></param> /// <param name="shopId"></param>
/// <returns></returns> /// <returns></returns>
public static (bool isOk, string msg) SetAlbbCooperation(string shopId) public static (bool isOk, bool isCanel, string msg) SetAlbbCooperation(string shopId)
{ {
var result = Http($"/HuiYan/itemlabels/SetAlbbCooperation?shopId={shopId}", ""); var result = Http($"/HuiYan/itemlabels/SetAlbbCooperation?shopId={shopId}", "");
var data = Newtonsoft.Json.JsonConvert.DeserializeObject<dynamic>(result); var data = Newtonsoft.Json.JsonConvert.DeserializeObject<dynamic>(result);
bool isSuccess = data.Success; bool isSuccess = data.Success;
bool isCanel = data.Data.isCanel;
return (isSuccess, data.Msg ?? ""); return (isSuccess, isCanel, data.Msg ?? "");
} }
/// <summary> /// <summary>

1
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
View File

@ -11,6 +11,7 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
ActiveGlowColor="{DynamicResource PrimaryColor}" ActiveGlowColor="{DynamicResource PrimaryColor}"
Height="780" Height="780"
Title="慧眼 V1.0.0.1"
Width="1468" Width="1468"
> >
<Border Padding="0 10" Background="#EEEEEE"> <Border Padding="0 10" Background="#EEEEEE">

104
客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs
View File

@ -839,11 +839,24 @@ namespace 齐越慧眼.UserControls
{ {
//判断是否团队过滤 //判断是否团队过滤
if (type == 1) if (type == 1)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').removeClass(""falseBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""falseBg"")"); Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""falseBg"")");
} }
}
if (type == 3) if (type == 3)
{
if (result.isCanel)
{
Brower.DoJavaScript(@$"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').find('.stateYellow').remove()");
}
else
{ {
int row = (int)Brower.DoJavaScript(@$"return $($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').find('.stateYellow').length").result; int row = (int)Brower.DoJavaScript(@$"return $($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').find('.stateYellow').length").result;
if (row < 1) if (row < 1)
@ -851,19 +864,41 @@ namespace 齐越慧眼.UserControls
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')"); Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')");
} }
} }
}
if (type == 0) if (type == 0)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').removeClass(""trueBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""trueBg"")"); Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""trueBg"")");
} }
}
if (type == 2) if (type == 2)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').removeClass(""popBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""popBg"")"); Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""popBg"")");
} }
}
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.stateGraydiv').removeClass(""divshow"")");
}
else
{
Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")"); Brower.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.stateGraydiv').addClass(""divshow"")");
} }
}
WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示"); WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示");
@ -905,11 +940,23 @@ namespace 齐越慧眼.UserControls
{ {
//判断是否团队过滤 //判断是否团队过滤
if (type == 1) if (type == 1)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').removeClass(""falseBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').addClass(""falseBg"")"); Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').addClass(""falseBg"")");
} }
}
if (type == 3) if (type == 3)
{
if (result.isCanel) {
Brower.DoJavaScript(@$"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').find('.stateYellow').remove()");
}
else
{ {
int row = (int)Brower.DoJavaScript(@$"return $($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').find('.stateYellow').length").result; int row = (int)Brower.DoJavaScript(@$"return $($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').find('.stateYellow').length").result;
if (row < 1) if (row < 1)
@ -917,19 +964,41 @@ namespace 齐越慧眼.UserControls
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')"); Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">竞</div>')");
} }
} }
}
if (type == 0) if (type == 0)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').removeClass(""trueBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').addClass(""trueBg"")"); Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').addClass(""trueBg"")");
} }
}
if (type == 2) if (type == 2)
{
if (result.isCanel) {
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').removeClass(""popBg"")");
} else
{ {
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').addClass(""popBg"")"); Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.myitemState').addClass(""popBg"")");
} }
}
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.stateGraydiv').removeClass(""divshow"")");
}
else
{
Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.stateGraydiv').addClass(""divshow"")"); Brower.DoJavaScript($@"$($('div#J_goodsList li[data-sku=""{itemId}""]')).find('.stateGraydiv').addClass(""divshow"")");
} }
}
WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示"); WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示");
@ -963,6 +1032,12 @@ namespace 齐越慧眼.UserControls
var result = ApiHelper.SetAlbbCooperation(shopId); var result = ApiHelper.SetAlbbCooperation(shopId);
if (result.isOk) if (result.isOk)
{
if (result.isCanel)
{
Brower.DoJavaScript(@$"$($('ul#sm-offer-list div[data-shopId=""{shopId}""]')).find('.myitemState').find('.stateYellow').remove()");
}
else
{ {
int row = (int)Brower.DoJavaScript(@$"return $($('ul#sm-offer-list div[data-shopId=""{shopId}""]')).find('.myitemState').find('.stateYellow').length").result; int row = (int)Brower.DoJavaScript(@$"return $($('ul#sm-offer-list div[data-shopId=""{shopId}""]')).find('.myitemState').find('.stateYellow').length").result;
if (row < 1) if (row < 1)
@ -970,6 +1045,7 @@ namespace 齐越慧眼.UserControls
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-shopId=""{shopId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">合</div>')"); Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-shopId=""{shopId}""]')).find('.myitemState').prepend('<div style=""width:20%;height:20%"" class=""stateYellow"">合</div>')");
} }
} }
}
WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示"); WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示");
return result.isOk; return result.isOk;
@ -992,22 +1068,48 @@ namespace 齐越慧眼.UserControls
{ {
//判断是否团队过滤 //判断是否团队过滤
if (type == 1) if (type == 1)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').removeClass(""falseBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""falseBg"")"); Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""falseBg"")");
} }
}
if (type == 0) if (type == 0)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').removeClass(""trueBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""trueBg"")"); Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""trueBg"")");
} }
}
if (type == 2) if (type == 2)
{
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').removeClass(""popBg"")");
}
else
{ {
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""popBg"")"); Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.myitemState').addClass(""popBg"")");
} }
}
if (result.isCanel)
{
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.stateGraydiv').removeClass(""divshow"")");
} else
{
Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.stateGraydiv').addClass(""divshow"")"); Brower.DoJavaScript($@"$($('ul#sm-offer-list div[data-sku=""{itemId}""]')).find('.stateGraydiv').addClass(""divshow"")");
} }
}
WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示"); WpfNoticeMsg.NoticeMessage.Show(result.msg, "提示");
return result.isOk; return result.isOk;
} }

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
View File

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
View File

File diff suppressed because one or more lines are too long

1
客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
View File

@ -5,6 +5,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<Version>1.0.0.1</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

Write Preview
Loading…
Cancel
Save