Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.Product/OrderModule.cs

@@ -6271,7 +6271,7 @@ namespace Mall.Module.Product
                         if (detailList.Any())
                         {
                             string goodsIds = string.Join(",", detailList.Select(x => x.GoodsId ?? 0).Distinct());
-                            var goodsList = goodsRepository.GetList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                            var goodsList = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId }, true);
                             var speciPList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
 
                             foreach (var item in detailList)
@@ -8784,7 +8784,7 @@ namespace Mall.Module.Product
                         if (detailList.Any())
                         {
                             string goodsIds = string.Join(",", detailList.Select(x => x.GoodsId ?? 0).Distinct());
-                            var goodsList = goodsRepository.GetList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                            var goodsList = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId }, true);
                             var speciPList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
 
                             foreach (var item in detailList)
@@ -9112,7 +9112,7 @@ namespace Mall.Module.Product
                     if (detailList.Any())
                     {
                         string goodsIds = string.Join(",", detailList.Select(x => x.GoodsId ?? 0).Distinct());
-                        var goodsList = goodsRepository.GetList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                        var goodsList = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId }, true);
                         var speciPList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
                         foreach (var item in detailList)
                         {
@@ -11422,7 +11422,7 @@ namespace Mall.Module.Product
             var detailList = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = orderModel.OrderId });
             foreach (var item in detailList)
             {
-                if (Convert.ToDateTime(item.TripSTime.Value.ToString("yyyy-MM-dd")).AddHours(-gbmodel.CancelHour) > DateTime.Now)
+                if (Convert.ToDateTime(item.TripSTime.Value.ToString("yyyy-MM-dd")).AddHours(-gbmodel.CancelHour) < DateTime.Now)
                 {
                     return "订单取消超时，需出发日提前" + gbmodel.CancelHour + "小时";
                 }

Mall.WindowsService/Module/FinanceModule.cs

@@ -440,7 +440,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                             if (detailList.Any())
                                             {
                                                 string goodsIds = string.Join(",", detailList.Select(x => x.GoodsId ?? 0).Distinct());
-                                                var goodsList = goodsRepository.GetList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                                                var goodsList = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId }, true);
                                                 var speciPList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsIds, TenantId = tenantId, MallBaseId = mallBaseId });
 
                                                 foreach (var ditem in detailList)