From c21d2ddedcb61fc5a7f79b1393f1de08748adc45 Mon Sep 17 00:00:00 2001 From: feng <279202647@qq.com> Date: Tue, 2 Aug 2022 10:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=AD=A5=E6=AD=A5=E4=B8=BA?= =?UTF-8?q?=E8=90=A5=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Coldairarrow.Api/Program.cs | 2 ++ src/Coldairarrow.Api/appsettings.json | 6 ++++ .../BBWY/productskuBusiness.cs | 29 ++++++++++++++++++ .../HuiYan/itemlabelsBusiness.cs | 10 ++++++- .../HuiYan/teamitemsBusiness.cs | 5 ++++ src/Coldairarrow.Entity/BBWY/productsku.cs | 30 +++++++++++++++++++ .../BBWY/IproductskuBusiness.cs | 13 ++++++++ .../DataAccess/IMDSDbAccessor.cs | 5 ++++ .../vuepage/client/src/api/http.js | 6 ++-- 9 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 src/Coldairarrow.Business/BBWY/productskuBusiness.cs create mode 100644 src/Coldairarrow.Entity/BBWY/productsku.cs create mode 100644 src/Coldairarrow.IBusiness/BBWY/IproductskuBusiness.cs diff --git a/src/Coldairarrow.Api/Program.cs b/src/Coldairarrow.Api/Program.cs index 088f63d..ac8c849 100644 --- a/src/Coldairarrow.Api/Program.cs +++ b/src/Coldairarrow.Api/Program.cs @@ -26,10 +26,12 @@ namespace Coldairarrow.Api var dbOptions = hostContext.Configuration.GetSection("Database:BaseDb").Get(); var dbmdsOptions = hostContext.Configuration.GetSection("MsdDatabase:BaseDb").Get(); + var bbwyOptions = hostContext.Configuration.GetSection("BBWYDatabase:BaseDb").Get(); config.UseDatabase(dbOptions.ConnectionString, dbOptions.DatabaseType); config.UseDatabase(dbmdsOptions.ConnectionString, dbmdsOptions.DatabaseType); + config.UseDatabase(bbwyOptions.ConnectionString, bbwyOptions.DatabaseType); }); }) diff --git a/src/Coldairarrow.Api/appsettings.json b/src/Coldairarrow.Api/appsettings.json index 0a12b90..fdc3726 100644 --- a/src/Coldairarrow.Api/appsettings.json +++ b/src/Coldairarrow.Api/appsettings.json @@ -54,6 +54,12 @@ "ConnectionString": "server=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;user id=qyroot;password=kaicn1132+-;persistsecurityinfo=True;database=mds;SslMode=none;AllowLoadLocalInfile=true;ConvertZeroDateTime=True" } }, + "BBWYDatabase": { + "BaseDb": { + "DatabaseType": "MySql", + "ConnectionString": "server=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;user id=qyroot;password=kaicn1132+-;persistsecurityinfo=True;database=bbwy_test;SslMode=none;AllowLoadLocalInfile=true;ConvertZeroDateTime=True" + } + }, //ѩ��Id,,�Խ���Ϊ��λ,��ͬ������������Id�ͻ���Id����ͬʱ�ظ� "WorkerId": 1, //����Id "WebRootUrl": "http://localhost:5000", //�ӿڸ���ַ, diff --git a/src/Coldairarrow.Business/BBWY/productskuBusiness.cs b/src/Coldairarrow.Business/BBWY/productskuBusiness.cs new file mode 100644 index 0000000..396a226 --- /dev/null +++ b/src/Coldairarrow.Business/BBWY/productskuBusiness.cs @@ -0,0 +1,29 @@ +using Coldairarrow.Entity.BBWY; +using Coldairarrow.IBusiness.BBWY; +using Coldairarrow.Util; +using Coldairarrow.Util.DataAccess; +using EFCore.Sharding; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Coldairarrow.Business.BBWY +{ + public class productskuBusiness : BaseBusiness, IproductskuBusiness, ITransientDependency + { + public productskuBusiness(IBBWYDbAccessor db) + : base(db) + { + } + + public bool CheckHasSku(string sku) + { + var model= Db.GetIQueryable().FirstOrDefault(c => c.Id == sku); + if (model == null) + return false; + return true; + } + } +} diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index 09bba06..7e4172a 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -12,20 +12,23 @@ using System.Threading.Tasks; using System.Linq.Expressions; using Coldairarrow.IBusiness; using Coldairarrow.Business.JDSku; +using Coldairarrow.IBusiness.BBWY; namespace Coldairarrow.Business.HuiYan { public class itemlabelsBusiness : BaseBusiness, IitemlabelsBusiness, ITransientDependency { IteamitemsBusiness iteamitemsBusiness; + IproductskuBusiness _iproductskuBusiness; IjdskutaskBusiness ijdskutaskBusiness; readonly IOperator _operator; - public itemlabelsBusiness(IDbAccessor db, IteamitemsBusiness _iteamitemsBusiness, IOperator @operator, IjdskutaskBusiness _ijdskutaskBusiness) + public itemlabelsBusiness(IDbAccessor db, IteamitemsBusiness _iteamitemsBusiness, IOperator @operator, IjdskutaskBusiness _ijdskutaskBusiness, IproductskuBusiness iproductskuBusiness) : base(db) { iteamitemsBusiness = _iteamitemsBusiness; _operator = @operator; ijdskutaskBusiness = _ijdskutaskBusiness; + _iproductskuBusiness=iproductskuBusiness ; } @@ -161,6 +164,11 @@ namespace Coldairarrow.Business.HuiYan //如果是竞品，则添加任务池 if (model.Status == ItemLabelStatus.Competing&& model.Platform== ItemPlatform.Jd) { + if (!_iproductskuBusiness.CheckHasSku(model.Sku)) + { + return Error("添加失败，请输入本集团内的竞品SKU！"); + } + //添加任务池 ijdskutaskBusiness.PushTask(new Entity.JDSku.jdskutask() { diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs index acbf224..7fc5dfa 100644 --- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs @@ -483,6 +483,11 @@ namespace Coldairarrow.Business.HuiYan foreach (var group in bjGroup) { var sonList = group.ToList(); + + //var needworkList = sonList.Where(c => c.State != PriceTaskState.比价完成).ToList(); + + //var kust = needworkList.GroupBy(c => c.State).Select(c => c.Key).ToList(); + var price = new PriceTaskInfo() { Title = group.Key, diff --git a/src/Coldairarrow.Entity/BBWY/productsku.cs b/src/Coldairarrow.Entity/BBWY/productsku.cs new file mode 100644 index 0000000..84aaffd --- /dev/null +++ b/src/Coldairarrow.Entity/BBWY/productsku.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Coldairarrow.Entity.BBWY +{ + [Table("productsku")] + public class productsku + { + [Key, Column(Order = 1)] + public string Id { get; set; } + public string ProductId { get; set; } + public decimal Price { get; set; } + + public string Title { get; set; } + public string Logo { get; set; } + + public long ShopId { get; set; } + + public int Platform { get; set; } + + public DateTime CreateTime { get; set; } + + public int State { get; set; } + } +} diff --git a/src/Coldairarrow.IBusiness/BBWY/IproductskuBusiness.cs b/src/Coldairarrow.IBusiness/BBWY/IproductskuBusiness.cs new file mode 100644 index 0000000..2c4f218 --- /dev/null +++ b/src/Coldairarrow.IBusiness/BBWY/IproductskuBusiness.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Coldairarrow.IBusiness.BBWY +{ + public interface IproductskuBusiness + { + bool CheckHasSku(string sku); + } +} diff --git a/src/Coldairarrow.Util/DataAccess/IMDSDbAccessor.cs b/src/Coldairarrow.Util/DataAccess/IMDSDbAccessor.cs index 0699bf9..a96db23 100644 --- a/src/Coldairarrow.Util/DataAccess/IMDSDbAccessor.cs +++ b/src/Coldairarrow.Util/DataAccess/IMDSDbAccessor.cs @@ -11,4 +11,9 @@ namespace Coldairarrow.Util.DataAccess { } + + public interface IBBWYDbAccessor : IDbAccessor + { + + } } diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js index ddff31d..5078eb2 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js @@ -11,7 +11,7 @@ let $httpVue = null, currentToken = ''; if (process.env.NODE_ENV == 'development') { axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY3MTAwOTkyM30.p3yLjbeUilDZxkfRv4GaCvIYJ_jFoe_8Sw8hY18swdA' - currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk' + currentToken='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY5MDI1NTI1Nn0.McaUJU3XY_twiL5TI_-KBn9X_ePzLfsEIhgiZ274Bv0' } else if (process.env.NODE_ENV == 'production') { axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; @@ -19,9 +19,9 @@ else if (process.env.NODE_ENV == 'production') { let ipAddress = axios.defaults.baseURL; -axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; +//axios.defaults.baseURL = 'http://hyapi.qiyue666.com/'; //axios.defaults.baseURL = 'http://111.230.132.27:8033/'; -// axios.defaults.baseURL = 'http://localhost:5000/'; + axios.defaults.baseURL = 'http://localhost:5000/'; axios.interceptors.request.use((config) => { //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken();