计费查询优化

Service/MyTask/SwapOrderSettleAnAccountTask.cs

@@ -38,7 +38,7 @@ public class SwapOrderSettleAnAccountTask : ITask
 
     public int Interval()
     {
-        return 1000 * 2;
+        return 1000 * 60;
     }
 
     public void Handle()
@@ -46,7 +46,11 @@ public class SwapOrderSettleAnAccountTask : ITask
         Log.Info("Begin SwapOrderSettleAnAccountTask");
 
         List<SwapOrderBattery> listSwapOrderBattery = SwapOrderBatteryRepository.QueryListByClause(i =>
-            i.DownNominalEnergy >0 && i.UpNominalEnergy >0 && i.SettleAnAccountFlag == null);
+            i.DownNominalEnergy >0 &&
+            i.UpNominalEnergy >0 &&
+            i.UpBatterySoc >0 &&
+            i.DownBatterySoc >0 &&
+            i.SettleAnAccountFlag == null);
 
         if (listSwapOrderBattery.Count > 0)
         {
@@ -56,6 +60,11 @@ public class SwapOrderSettleAnAccountTask : ITask
                 .Queryable()
                 .In(swapOrder => swapOrder.Sn, list)
                 .ToList();
+
+            if (swapOrderList.Count<=0)
+            {
+                return;
+            }
             // 电费单价
             decimal electricityTotalFee = StaticStationInfo.ElectricityTotalFee;
             // 换电服务费用