服务时间调整

Mall.Module.Property/PropertyModule.cs

@@ -335,7 +335,7 @@ namespace Mall.Module.Property
                     item.GoodsRemark += string.Join(",", sList);
                 }
             }
-            demodel.TotalCostMoney = demodel.DetailList.Sum(x => x.CostMoney ?? 0);
+            demodel.TotalCostMoney = demodel.DetailList.Sum(x => (x.CostMoney ?? 0) * (x.Number ?? 0));
             demodel.TotalNumber = demodel.DetailList.Sum(x => x.Number ?? 0);
             demodel.Status = 0;
             demodel.RB_Branch_Id = eRPBranchId;

Mall.WindowsService/Module/FinanceModule.cs

@@ -546,8 +546,8 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                 {
                     if (item.AutoReceiving > 0)
                     {
-                        //查询未付款的所有订单
-                        var olist = goods_OrderRepository.GetCanReceivingOrderList(item.CancelTime, item.TenantId, item.MallBaseId);
+                        //查询待发货的所有订单
+                        var olist = goods_OrderRepository.GetCanReceivingOrderList(item.AutoReceiving, item.TenantId, item.MallBaseId);
                         foreach (var qitem in olist)
                         {
                             Dictionary<string, object> keyValues = new Dictionary<string, object>() { };