提交代码

Mall.WebApi/Controllers/Product/AppletGuideCarController.cs

@@ -128,25 +128,29 @@ namespace Mall.WebApi.Controllers.Product
 
             DateTime tempStartTime = Convert.ToDateTime(demodel.StartTime);
             DateTime tempEndTime = Convert.ToDateTime(demodel.EndTime);
-            if (tempStartTime.ToString("yyyy-MM-dd") == tempEndTime.ToString("yyyy-MM-dd"))//判断使用天数是否是0.5天/1天
+            if (demodel.CarType.HasValue && (demodel.CarType == Common.Enum.Goods.GuideCarGoodsTypeEnum.JJ || demodel.CarType == Common.Enum.Goods.GuideCarGoodsTypeEnum.SJ))
             {
-                TimeSpan sp = tempEndTime.Subtract(tempStartTime);
-                if (sp.Hours > 6)
+                demodel.UseDay = 1;
+            }
+            else {
+                if (tempStartTime.ToString("yyyy-MM-dd") == tempEndTime.ToString("yyyy-MM-dd"))//判断使用天数是否是0.5天/1天
                 {
-                    demodel.UseDay = 1;
+                    TimeSpan sp = tempEndTime.Subtract(tempStartTime);
+                    if (sp.Hours > 6)
+                    {
+                        demodel.UseDay = 1;
+                    }
+                    else
+                    {
+                        demodel.UseDay = Convert.ToDecimal(0.5);
+                    }
                 }
                 else
                 {
-                    demodel.UseDay = Convert.ToDecimal(0.5);
+                    TimeSpan sp = tempEndTime.Date.Subtract(tempStartTime.Date);
+                    demodel.UseDay = sp.Days + 1;
                 }
             }
-            else
-            {
-                TimeSpan sp = tempEndTime.Date.Subtract(tempStartTime.Date);
-                demodel.UseDay = sp.Days + 1;
-            }
-
-
 
             var list = guideCarModule.GetAppletGuidCarPageListForCar(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             List<object> RList = new List<object>();