增加税务成本

src/Coldairarrow.Api/Controllers/HuiYan/pricetasklogController.cs

@@ -130,7 +130,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan
 
         [HttpGet("/task/dayrun")]
         [AllowAnonymous]
-        [QuartzTask(CronExpression = "0 0 7 * * ?", Router ="/task/dayrun")]
+        [QuartzTask(IntervalInSeconds = 60 * 60 * 1, IsRepeatForever = true, Router = "/task/dayrun")]
         public AjaxResult DayTaskSet()
         {
             _pricetasklogBus.DayTaskSet();

src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs

@@ -8,6 +8,7 @@ using Coldairarrow.Util;
 using EFCore.Sharding;
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,13 +23,15 @@ namespace Coldairarrow.Business.HuiYan
         IuserBusiness _iuserBusiness;
         IteamitemsBusiness _iteamitemsBusiness;
         readonly IOperator _operator;
-        public pricetasklogBusiness(IDbAccessor db, IuserBusiness iuserBusiness, IteamitemsBusiness iteamitemsBusiness,
+        readonly ILogger _logger;
+        public pricetasklogBusiness(IDbAccessor db, IuserBusiness iuserBusiness, IteamitemsBusiness iteamitemsBusiness, ILogger<pricetasklogBusiness> logger,
             IOperator @operator)
         : base(db)
         {
             _operator = @operator;
             _iuserBusiness = iuserBusiness;
             _iteamitemsBusiness = iteamitemsBusiness;
+            _logger = logger;
         }
 
         #region 外部接口
@@ -76,7 +79,8 @@ namespace Coldairarrow.Business.HuiYan
         public AjaxResult GetTaskCount()
         {
             var list = Db.GetIQueryable<pricetasklog>().Where(c => c.UserId == _operator.UserId).Select(c => c.State).ToList();
-            return Success(list.GroupBy(c => c).Select(c=>new {Id= c.Key,Count=c.Count() }));
+
+            return Success(list.GroupBy(c => c).Select(c => new { Id = c.Key, Count = c.Count() }));
         }
 
 
@@ -145,7 +149,9 @@ namespace Coldairarrow.Business.HuiYan
         {
             try
             {
-                var needUpdates = Db.GetIQueryable<pricetasklog>().Where(c => c.State == PriceTaskState.已比价 && c.WorkDate != null && (DateTime.Now - c.WorkDate.Value).TotalHours >= 48).ToList();
+                //&& (DateTime.Now - c.WorkDate.Value).TotalHours >= 48
+
+                var needUpdates = Db.GetIQueryable<pricetasklog>().Where(c => c.State == PriceTaskState.已比价 && c.WorkDate != null).AsEnumerable<pricetasklog>().Where(c=>(DateTime.Now - c.WorkDate.Value).TotalHours >= 48).ToList();
 
                 if (needUpdates.Count > 0)
                 {

src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs

@@ -169,7 +169,7 @@ namespace Coldairarrow.Business.HuiYan
             model.Extensions = new List<TeamItemExtension>();
 
             for (int i = 0; i < 5; i++)
-                model.Extensions.Add(new TeamItemExtension() { Platform = model.Platform });
+                model.Extensions.Add(new TeamItemExtension() { Platform = model.Platform, KDPrice = 6 });
 
             if (string.IsNullOrEmpty(model.ItemId))
             {

src/Coldairarrow.Entity/DTO/TeamitemDto.cs

@@ -83,6 +83,11 @@ namespace Coldairarrow.Entity.DTO
         /// </summary>
         public decimal PlatformPoint { get; set; }
 
+        /// <summary>
+        /// 税务成本
+        /// </summary>
+        public decimal TaxPrice { get; set; }
+
         /// <summary>
         /// 利润
         /// </summary>

客户端/齐越慧眼/齐越慧眼/MainWindow.xaml

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

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue

@@ -105,15 +105,18 @@
         <a-col :span="3">
           <div class="headCol">SKU名称</div>
         </a-col>
-        <a-col :span="2">
+        <a-col :span="1">
           <div class="headCol">采购价</div>
         </a-col>
-        <a-col :span="2">
+        <a-col :span="1">
           <div class="headCol">快递费</div>
         </a-col>
         <a-col :span="2">
           <div class="headCol">平台扣点</div>
         </a-col>
+        <a-col :span="2">
+          <div class="headCol">税务成本</div>
+        </a-col>
         <a-col :span="1">
           <div class="headCol">利润</div>
         </a-col>
@@ -242,7 +245,7 @@
           </div>
         </a-col>
         <!--采购价-->
-        <a-col :span="2" style="margin-top: 5px">
+        <a-col :span="1" style="margin-top: 5px">
           <div
             v-for="(ext, index) in item.Extensions"
             style="height: 40px"
@@ -256,7 +259,7 @@
           </div>
         </a-col>
         <!--快递费-->
-        <a-col :span="2" style="margin-top: 5px">
+        <a-col :span="1" style="margin-top: 5px">
           <div
             v-for="(ext, index) in item.Extensions"
             style="height: 40px"
@@ -280,6 +283,17 @@
             <span class="spanValue">{{ ext.PlatformPoint }}</span>
           </div>
         </a-col>
+        <!--税务成本-->
+        <a-col :span="2" style="margin-top: 5px">
+          <div
+            v-for="(ext, index) in item.Extensions"
+            style="height: 40px"
+            :key="index"
+          >
+            <a-input v-if="item.isEdit" v-model="ext.TaxPrice"></a-input>
+            <span v-else class="spanValue">{{ ext.TaxPrice }}</span>
+          </div>
+        </a-col>
         <!--利润-->
         <a-col :span="1" style="margin-top: 5px">
           <div
@@ -761,11 +775,24 @@ export default {
     //获取利润率
     initProfits(item,ext){
             ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
+
+              var taxp=parseFloat(item.RivalPrice * 0.03).toFixed(2)
+              if(ext.TaxPrice<=0||ext.TaxPrice==undefined)
+              {
+                ext.TaxPrice = parseFloat(item.RivalPrice * 0.03).toFixed(2);
+              }
+
+              if(ext.KDPrice==undefined)
+              {
+                ext.KDPrice=6
+              }
+
               ext.Profit =
-                item.RivalPrice -
+                parseFloat(item.RivalPrice) -
-                ext.BuyPrice -
+                parseFloat(ext.BuyPrice) -
-                ext.KDPrice -
+                parseFloat(ext.KDPrice) -
-                ext.PlatformPoint;
+                parseFloat(ext.PlatformPoint)-
+                parseFloat(ext.TaxPrice);
                 
                 ext.Profit=parseFloat(
                   ext.Profit
@@ -775,7 +802,7 @@ export default {
                 ext.Profits = 0;
               } else {
                 ext.Profits = parseFloat(
-                  (ext.Profit / (ext.BuyPrice+ext.KDPrice)) * 100
+                  (ext.Profit / (parseFloat(ext.BuyPrice)+ext.KDPrice)) * 100
                 ).toFixed(2);
               }
     },

客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/pricetask/Index.vue

@@ -93,15 +93,18 @@
         <a-col :span="3">
           <div class="headCol">SKU名称</div>
         </a-col>
-        <a-col :span="2">
+        <a-col :span="1">
           <div class="headCol">采购价</div>
         </a-col>
-        <a-col :span="2">
+        <a-col :span="1">
           <div class="headCol">快递费</div>
         </a-col>
         <a-col :span="2">
           <div class="headCol">平台扣点</div>
         </a-col>
+        <a-col :span="2">
+          <div class="headCol">税务成本</div>
+        </a-col>
         <a-col :span="1">
           <div class="headCol">利润</div>
         </a-col>
@@ -223,7 +226,7 @@
           </div>
         </a-col>
         <!--采购价-->
-        <a-col :span="2" style="margin-top: 5px">
+        <a-col :span="1" style="margin-top: 5px">
           <div
             v-for="(ext, index) in item.Extensions"
             style="height: 40px"
@@ -237,7 +240,7 @@
           </div>
         </a-col>
         <!--快递费-->
-        <a-col :span="2" style="margin-top: 5px">
+        <a-col :span="1" style="margin-top: 5px">
           <div
             v-for="(ext, index) in item.Extensions"
             style="height: 40px"
@@ -261,6 +264,18 @@
             <span class="spanValue">{{ ext.PlatformPoint }}</span>
           </div>
         </a-col>
+        
+        <!--税务成本-->
+        <a-col :span="2" style="margin-top: 5px">
+          <div
+            v-for="(ext, index) in item.Extensions"
+            style="height: 40px"
+            :key="index"
+          >
+            <a-input v-if="item.isEdit" v-model="ext.TaxPrice"></a-input>
+            <span v-else class="spanValue">{{ ext.TaxPrice }}</span>
+          </div>
+        </a-col>
         <!--利润-->
         <a-col :span="1" style="margin-top: 5px">
           <div
@@ -669,11 +684,25 @@ export default {
     //获取利润率
     initProfits(item,ext){
             ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2);
+
+
+              var taxp=parseFloat(item.RivalPrice * 0.03).toFixed(2)
+              if(ext.TaxPrice<=0||ext.TaxPrice==undefined)
+              {
+                ext.TaxPrice = parseFloat(item.RivalPrice * 0.03).toFixed(2);
+              }
+
+              if(ext.KDPrice==undefined)
+              {
+                ext.KDPrice=6
+              }
+
               ext.Profit =
-                item.RivalPrice -
+                parseFloat(item.RivalPrice) -
-                ext.BuyPrice -
+                parseFloat(ext.BuyPrice) -
-                ext.KDPrice -
+                parseFloat(ext.KDPrice) -
-                ext.PlatformPoint;
+                parseFloat(ext.PlatformPoint)-
+                parseFloat(ext.TaxPrice);
                 
                 ext.Profit=parseFloat(
                   ext.Profit
@@ -683,7 +712,7 @@ export default {
                 ext.Profits = 0;
               } else {
                 ext.Profits = parseFloat(
-                  (ext.Profit / (ext.BuyPrice+ext.KDPrice)) * 100
+                  (ext.Profit / (parseFloat(ext.BuyPrice)+ext.KDPrice)) * 100
                 ).toFixed(2);
               }
     },