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

Mall.Module.Product/OrderModule.cs

@@ -6115,15 +6115,25 @@ namespace Mall.Module.Product
             }
             else if (type == 2)
             {
-                if (omodel.OrderStatus != OrderStatusEnum.WaitSendGoods)
+                if (omodel.OrderClassify == 1)
                 {
-                    return false;
+                    if (omodel.OrderStatus != OrderStatusEnum.WaitSendGoods || omodel.OrderStatus != OrderStatusEnum.WaitReceiving)
+                    {
+                        return false;
+                    }
                 }
-                //物流
-                var erlist = goods_ExpressRelevanceRepository.GetList(new RB_Goods_ExpressRelevance_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
-                if (erlist.Any())
+                else
                 {
-                    return false;//已有商品发货，无法退款
+                    if (omodel.OrderStatus != OrderStatusEnum.WaitSendGoods)
+                    {
+                        return false;
+                    }
+                    //物流
+                    var erlist = goods_ExpressRelevanceRepository.GetList(new RB_Goods_ExpressRelevance_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
+                    if (erlist.Any())
+                    {
+                        return false;//已有商品发货，无法退款
+                    }
                 }
             }
             var trans = goods_OrderRepository.DbTransaction;
@@ -8601,6 +8611,7 @@ namespace Mall.Module.Product
                     keyValues.Add(nameof(RB_Goods_Order.CancelTime), DateTime.Now);
                     keyValues.Add(nameof(RB_Goods_Order.ApplyForCancelStatus), 1);
                     keyValues.Add(nameof(RB_Goods_Order.RefundOrderNo), RefundOrderNo);
+                    keyValues.Add(nameof(RB_Goods_Order.Refund), omodel.Income);
                 }
                 else
                 {
@@ -8608,7 +8619,6 @@ namespace Mall.Module.Product
                     keyValues.Add(nameof(RB_Goods_Order.OrderStatus), omodel.HistoryOrderStatus);
                     keyValues.Add(nameof(RB_Goods_Order.RejectRemark), remark);
                     keyValues.Add(nameof(RB_Goods_Order.IsApplyForCancel), 2);
-                    keyValues.Add(nameof(RB_Goods_Order.Refund), omodel.Income);
                 }
 
                 List<WhereHelper> wheres = new List<WhereHelper>() {

Mall.Module.User/SmallShopsModule.cs

@@ -867,7 +867,7 @@ namespace Mall.Module.User
                 //查询出所有商品id
                 string goodsIds = string.Join(",", goodsList.Select(x => x.GoodsId ?? 0).Distinct());
 
-                var glist = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+                var glist = goodsRepository.GetSingleList(new RB_Goods_Extend() { GoodsIds = goodsIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, true);
                 foreach (var item in glist)
                 {
                     item.CoverImage = "";
@@ -1021,7 +1021,7 @@ namespace Mall.Module.User
         public object GetSmallShopsChooseGoodsPageList(int pageIndex, int pageSize, out long count, RB_SmallShops_Price_Extend demodel)
         {
             List<object> RList = new List<object>();
-            var glist = goodsRepository.GetPageList(pageIndex, pageSize, out count, new RB_Goods_Extend() { Id = demodel.GoodsId ?? 0, Name = demodel.GoodsName, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+            var glist = goodsRepository.GetPageList(pageIndex, pageSize, out count, new RB_Goods_Extend() { Id = demodel.GoodsId ?? 0, Name = demodel.GoodsName, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, true);
             if (glist.Any())
             {
                 //查询出所有商品id

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -22,9 +22,12 @@ namespace Mall.Repository.Product
         /// <param name="rowCount">总条数</param>
         /// <param name="dmodel">查询条件</param>
         /// <returns></returns>
-        public List<RB_Goods_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Goods_Extend dmodel)
+        public List<RB_Goods_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Goods_Extend dmodel,bool IsAllClassify = false)
         {
-            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 and g.GoodsClassify=0";
+            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 ";
+            if (IsAllClassify == false) {
+                where += $@" and g.GoodsClassify=0";
+            }
             if (dmodel.TenantId > 0)
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.TenantId)}={dmodel.TenantId}";
@@ -199,9 +202,12 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Goods_Extend> GetSingleList(RB_Goods_Extend dmodel)
+        public List<RB_Goods_Extend> GetSingleList(RB_Goods_Extend dmodel,bool IsAllClassify = false)
         {
-            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 and g.GoodsClassify=0";
+            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 ";
+            if (IsAllClassify == false) {
+                where += $@" and g.GoodsClassify=0";
+            }
             if (dmodel.TenantId > 0)
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.TenantId)}={dmodel.TenantId}";

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1695,6 +1695,23 @@ LEFT JOIN rb_guidecar_guide as gcg on gcg.ID=od.GuideId
 where {where} group by o.OrderId order by o.CreateDate desc";
             return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取司导订单已逾期 未完成的订单
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Order_Extend> GetSDOrderNotFinishList(int tenantId, int mallBaseId)
+        {
+            string sql = $@"
+SELECT o.* FROM rb_goods_order o
+INNER JOIN rb_goods_orderdetail od on o.OrderId = od.OrderId
+WHERE o.TenantId={tenantId} AND o.MallBaseId={mallBaseId} AND o.`Status`=0 AND o.Recycled=2 AND o.OrderStatus =4 AND o.OrderClassify =1 AND od.TripETime < '{DateTime.Now.ToString("yyyy-MM-dd")}' 
+GROUP BY o.OrderId
+";
+            return Get<RB_Goods_Order_Extend>(sql).ToList();
+        }
         #endregion
     }
 }

Mall.WindowsService/Module/FinanceModule.cs

@@ -661,12 +661,27 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                             }
                         }
                     }
+
+                    try
+                    {
+                        //查询所有司导已逾期未完成订单
+                        var olist = goods_OrderRepository.GetSDOrderNotFinishList(item.TenantId, item.MallBaseId);
+                        foreach (var qitem in olist)
+                        {
+                            //自动确认订单
+                            SetOrderOperation(qitem, 6, "", 0, "", item.TenantId, item.MallBaseId, 0);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Helper.LogHelper.Write("AutoSDOrderFinishOrder:" + ex.Message);
+                    }
                 }
                 return true;
             }
             catch (Exception ex)
             {
-                Helper.LogHelper.Write("AutoCancelOrder:" + ex.Message);
+                Helper.LogHelper.Write("AutoReceivingOrder:" + ex.Message);
                 return false;
             }
         }

Mall.WindowsService/appsettings.json

 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; ",
+    "DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {