加入步步为营数据库

src/Coldairarrow.Api/Program.cs

@@ -26,10 +26,12 @@ namespace Coldairarrow.Api
 
                         var dbOptions = hostContext.Configuration.GetSection("Database:BaseDb").Get<DatabaseOptions>();
                         var dbmdsOptions = hostContext.Configuration.GetSection("MsdDatabase:BaseDb").Get<DatabaseOptions>();
+                        var bbwyOptions = hostContext.Configuration.GetSection("BBWYDatabase:BaseDb").Get<DatabaseOptions>();
 
                         config.UseDatabase(dbOptions.ConnectionString, dbOptions.DatabaseType);
 
                         config.UseDatabase<IMDSDbAccessor>(dbmdsOptions.ConnectionString, dbmdsOptions.DatabaseType);
+                        config.UseDatabase<IBBWYDbAccessor>(bbwyOptions.ConnectionString, bbwyOptions.DatabaseType);
                     });
                 })
               

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", //�ӿڸ���ַ,

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<productsku>, IproductskuBusiness, ITransientDependency
+    {
+        public productskuBusiness(IBBWYDbAccessor db)
+            : base(db)
+        {
+        }
+
+        public bool CheckHasSku(string sku)
+        {
+            var model= Db.GetIQueryable<productsku>().FirstOrDefault(c => c.Id == sku);
+            if (model == null)
+                return false;
+            return true;
+        }
+    }
+}

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<itemlabels>, 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()
                 {

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,

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; }
+    }
+}

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);
+    }
+}

src/Coldairarrow.Util/DataAccess/IMDSDbAccessor.cs

@@ -11,4 +11,9 @@ namespace Coldairarrow.Util.DataAccess
     {
 
     }
+
+    public interface IBBWYDbAccessor : IDbAccessor
+    {
+
+    }
 }

客户端/齐越慧眼/齐越慧眼/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();