提交代码

Mall.Model/Entity/GuideCar/RB_GuideCar_Guide.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.GuideCar
+{
+    /// <summary>
+    /// 司导-导游实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public  class RB_GuideCar_Guide
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        /// <summary>
+        /// 状态0-正常，1-冻结
+        /// </summary>
+        public int IsEnable { get; set; }
+
+        /// <summary>
+        /// 导游名称
+        /// </summary>
+        public string Name { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string GuidePhoto { get; set; }
+
+
+        /// <summary>
+        /// 从业年限
+        /// </summary>
+        public decimal WorkYears { get; set; }
+
+        /// <summary>
+        /// 用户评分
+        /// </summary>
+        public decimal Score { get; set; }
+
+        /// <summary>
+        /// 所属站点
+        /// </summary>
+        public int SiteId { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Telephone { get; set; }
+
+        /// <summary>
+        /// 紧急联系电话
+        /// </summary>
+        public string EmergencyPhone { get; set; }
+
+        /// <summary>
+        /// 简介
+        /// </summary>
+        public string Introduction { get; set; }
+    }
+}

Mall.Model/Entity/GuideCar/RB_GuideCar_Site.cs

@@ -24,7 +24,11 @@ namespace Mall.Model.Entity.GuideCar
         /// </summary>
         public int MallBaseId { get; set; }
 
-       
+
+        /// <summary>
+        /// 是否开启0-否，1-是
+        /// </summary>
+        public int IsEnable { get; set; }
 
         /// <summary>
         /// 站点名称
@@ -37,6 +41,6 @@ namespace Mall.Model.Entity.GuideCar
         public DateTime CreateDate { get; set; }
         public DateTime UpdateDate { get; set; }
 
-        public int RulesType { get; set; }
+        public int SiteType { get; set; }
     }
 }

Mall.Model/Entity/GuideCar/RB_GuideCar_SiteRegion.cs

@@ -38,7 +38,7 @@ namespace Mall.Model.Entity.BaseSetUp
         public int MallBaseId { get; set; }
 
 
-        public int RulesType { get; set; }
+        public int SiteType { get; set; }
 
         public int Status { get; set; }
 

Mall.Model/Extend/GuideCar/RB_GuideCar_Guide_Extend.cs

+using Mall.Model.Entity.GuideCar;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.GuideCar
+{
+    /// <summary>
+    /// 司导-导游扩展表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_GuideCar_Guide_Extend : RB_GuideCar_Guide
+    {
+        /// <summary>
+        /// 站点名称
+        /// </summary>
+        public string SiteName { get; set; }
+
+        /// <summary>
+        /// 订单数
+        /// </summary>
+        public int OrderNum { get; set; }
+
+        /// <summary>
+        /// 商品数
+        /// </summary>
+        public int GoodsNum { get; set; }
+
+        /// <summary>
+        /// 关联商品
+        /// </summary>
+        public List<RB_Goods_Extend> GoodsList { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+
+        /// <summary>
+        /// 开始年限
+        /// </summary>
+        public int StartWorkYears { get; set; }
+        /// <summary>
+        /// 结束年限
+        /// </summary>
+        public int EndWorkYears { get; set; }
+
+
+        /// <summary>
+        /// 开始评分
+        /// </summary>
+        public decimal StartScore { get; set; }
+        /// <summary>
+        /// 结束评分
+        /// </summary>
+        public decimal EndScore { get; set; }
+    }
+}

Mall.Repository/GuideCar/RB_GuideCar_GuideRepository.cs

+using Mall.Model.Entity.GuideCar;
+using Mall.Model.Extend.GuideCar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.GuideCar
+{
+    public class RB_GuideCar_GuideRepository : BaseRepository<RB_GuideCar_Guide>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_GuideCar_Guide); } }
+
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string SiteTableName { get { return nameof(RB_GuideCar_Site); } }
+        /// <summary>
+        /// 导游列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_GuideCar_Guide_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_GuideCar_Guide_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,b.SiteName FROM {TableName} as a LEFT JOIN {SiteTableName} as b on a.SiteId=b.ID WHERE  a.{nameof(RB_GuideCar_Guide_Extend.Status)}=0");
+            if (query != null)
+            {
+                // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Name)} like '%{query.Name}%'");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.ID)}={query.ID}");
+                }
+                if (query.IsEnable > -1)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.IsEnable)}={query.IsEnable}");
+                }
+                if (query.StartWorkYears > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}>={query.StartWorkYears}");
+                }
+                if (query.EndWorkYears > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}<={query.EndWorkYears}");
+                }
+
+                if (query.StartScore > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Score)}>={query.StartScore}");
+                }
+                if (query.EndScore > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Score)}<={query.EndScore}");
+                }
+                if (query.IsEnable > -1)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.IsEnable)}={query.IsEnable}");
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.Append($" and a.{nameof(RB_GuideCar_Guide_Extend.CreateDate)} >='{query.StartTime}'");
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.Append($"  and a.{nameof(RB_GuideCar_Guide_Extend.CreateDate)} <='{query.EndTime} 23:59:59'");
+                }
+            }
+            return GetPage<RB_GuideCar_Guide_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        ///导游列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_GuideCar_Guide_Extend> GetLogisticsRulesList(RB_GuideCar_Guide_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT a.*,b.SiteName FROM {TableName} as a LEFT JOIN {SiteTableName} as b on a.SiteId=b.ID WHERE  a.{nameof(RB_GuideCar_Guide_Extend.Status)}=0");
+            if (query != null)
+            {
+                // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Name)} like '%{query.Name}%'");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.ID)}={query.ID}");
+                }
+                if (query.IsEnable > -1)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.IsEnable)}={query.IsEnable}");
+                }
+                if (query.StartWorkYears > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}>={query.StartWorkYears}");
+                }
+                if (query.EndWorkYears > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}<={query.EndWorkYears}");
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.Append($" and a.{nameof(RB_GuideCar_Guide_Extend.CreateDate)} >='{query.StartTime}'");
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.Append($"  and a.{nameof(RB_GuideCar_Guide_Extend.CreateDate)} <='{query.EndTime} 23:59:59'");
+                }
+            }
+            return Get<RB_GuideCar_Guide_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/GuideCar/RB_GuideCar_SiteRegionRepository.cs

@@ -36,9 +36,9 @@ LEFT JOIN {DestinationTableName} as c on b.ParentID = c.ID WHERE   a.{nameof(RB_
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_SiteRegion_Extend.TenantId)}={query.TenantId}");
                 }
-                if (query.RulesType > 0)
+                if (query.SiteType > 0)
                 {
-                    builder.Append($" AND a.{nameof(RB_GuideCar_SiteRegion_Extend.RulesType)}={(int)query.RulesType}");
+                    builder.Append($" AND a.{nameof(RB_GuideCar_SiteRegion_Extend.SiteType)}={query.SiteType}");
                 }
                 if (query.MallBaseId > 0)
                 {
@@ -72,9 +72,9 @@ LEFT JOIN {DestinationTableName} as c on b.ParentID = c.ID WHERE   a.{nameof(RB_
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_SiteRegion_Extend.TenantId)}={query.TenantId}");
                 }
-                if (query.RulesType > 0)
+                if (query.SiteType > 0)
                 {
-                    builder.Append($" AND a.{nameof(RB_GuideCar_SiteRegion_Extend.RulesType)}={(int)query.RulesType}");
+                    builder.Append($" AND a.{nameof(RB_GuideCar_SiteRegion_Extend.SiteType)}={query.SiteType}");
                 }
                 if (query.MallBaseId > 0)
                 {

Mall.Repository/GuideCar/RB_GuideCar_SiteRepository.cs

@@ -40,9 +40,9 @@ namespace Mall.Repository.GuideCar
                 {
                     builder.Append($" AND {nameof(RB_GuideCar_Site_Extend.SiteName)} like '%{query.SiteName}%'");
                 }
-                if (query.RulesType > 0)
+                if (query.SiteType > 0)
                 {
-                    builder.Append($" AND {nameof(RB_GuideCar_Site_Extend.RulesType)}={(int)query.RulesType}");
+                    builder.Append($" AND {nameof(RB_GuideCar_Site_Extend.SiteType)}={(int)query.SiteType}");
                 }
             }
             return GetPage<RB_GuideCar_Site_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
@@ -79,9 +79,9 @@ namespace Mall.Repository.GuideCar
                 {
                     builder.Append($" AND {nameof(RB_GuideCar_Site_Extend.SiteName)} like '%{query.SiteName}%'");
                 }
-                if (query.RulesType > 0)
+                if (query.SiteType > 0)
                 {
-                    builder.Append($" AND {nameof(RB_GuideCar_Site_Extend.RulesType)}={(int)query.RulesType}");
+                    builder.Append($" AND {nameof(RB_GuideCar_Site_Extend.SiteType)}={query.SiteType}");
                 }
              
                 if (!string.IsNullOrEmpty(query.SiteIds))

Mall.WebApi/Controllers/Product/GuideCarController.cs

@@ -35,7 +35,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetGuideCarInfo() {
+        public ApiResult GetGuideCarInfo()
+        {
             var req = RequestParm;
 
             var model = guideCarModule.GetGuideCarInfo(req.TenantId, req.MallBaseId);
@@ -60,20 +61,24 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_GuideCar_Site_Extend demodel = JsonConvert.DeserializeObject<RB_GuideCar_Site_Extend>(RequestParm.msg.ToString());
             demodel.TenantId = UserInfo.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
-            demodel.RulesType =1;
+            demodel.SiteType = 1;
             var list = guideCarModule.GetGuideCarSiteList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
             {
                 x.ID,
                 x.SiteName,
+                x.IsEnable,
                 RegionList = x.RegionList.Select(x => x.RegionName)
             });
             return ApiResult.Success("", pagelist);
         }
 
-
-
+        /// <summary>
+        /// 删除站点
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
         public ApiResult DelGuideCarSiteInfo()
         {
             var parms = RequestParm;
@@ -94,17 +99,48 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
+
+        /// <summary>
+        /// 删除站点
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult EnableGuideCarSiteInfo()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            string idInfo = parmsJob.GetStringValue("Ids");
+            int isEnable = parmsJob.GetInt("IsEnable", 0);
+            if (string.IsNullOrWhiteSpace(idInfo))
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+
+            bool flag = guideCarModule.EnableGuideCarSiteInfo(idInfo.Split(",").ToList(), isEnable, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+
+
         /// <summary>
         /// 获取详情
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult GetGuideCarSiteModel()
         {
             var parms = RequestParm;
             var query = JsonConvert.DeserializeObject<RB_GuideCar_Site_Extend>(RequestParm.msg.ToString());
             query.TenantId = UserInfo.TenantId;
             query.MallBaseId = parms.MallBaseId;
-            query.RulesType =1;
+            query.SiteType = 1;
             var oldLogisticsModel = guideCarModule.GetGuideCarSiteModel(query);
             if (oldLogisticsModel == null)
             {
@@ -113,6 +149,23 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", oldLogisticsModel);
         }
 
+        /// <summary>
+        /// 获取全部站点
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAllGuideCarSiteList()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_GuideCar_Site_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            query.SiteType = 1;
+            var list = guideCarModule.GetGuideCarSiteList(query);
+            var result = list.Where(x => x.IsEnable == 1).Select(x => new { x.ID, x.SiteName });
+            return ApiResult.Success("", result);
+        }
+
 
         /// <summary>
         /// 保存司导站点信息
@@ -124,7 +177,7 @@ namespace Mall.WebApi.Controllers.MallBase
             var query = JsonConvert.DeserializeObject<RB_GuideCar_Site_Extend>(RequestParm.msg.ToString());
             query.TenantId = UserInfo.TenantId;
             query.MallBaseId = parms.MallBaseId;
-            query.RulesType = 1;
+            query.SiteType = 1;
             if (query == null)
             {
                 return ApiResult.Failed("请传入站点信息");
@@ -135,7 +188,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 {
                     return ApiResult.Failed("请输入站点名称");
                 }
-                
+
                 if (query.RegionList == null || !query.RegionList.Any())
                 {
                     return ApiResult.Failed("请选择地区");
@@ -157,6 +210,149 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
             }
         }
+
+
+        #endregion
+
+        #region 导游信息
+        [HttpPost]
+        public ApiResult GetGuidePageListRepository()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_GuideCar_Guide_Extend demodel = JsonConvert.DeserializeObject<RB_GuideCar_Guide_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = guideCarModule.GetGuidePageListRepository(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.GuidePhoto,
+                x.Name,
+                x.WorkYears,
+                Score = x.Score == 0 ? "暂无" : x.Score.ToString(),
+                x.SiteName,
+                x.OrderNum,
+                x.GoodsList,
+                x.GoodsNum,
+                CreateDateStr = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                x.IsEnable,
+                x.Telephone,
+                x.EmergencyPhone
+
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 禁用/启用导游状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult EnableGuideCarGuideInfo()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            string idInfo = parmsJob.GetStringValue("Ids");
+            int isEnable = parmsJob.GetInt("IsEnable", 0);
+            if (string.IsNullOrWhiteSpace(idInfo))
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+
+            bool flag = guideCarModule.EnableGuideCarGuideInfo(idInfo.Split(",").ToList(), isEnable, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetGuideCarGuideModel()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_GuideCar_Guide_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsModel = guideCarModule.GetGuideCarGuideModel(query);
+            if (oldLogisticsModel == null)
+            {
+                oldLogisticsModel = new RB_GuideCar_Guide_Extend();
+            }
+            return ApiResult.Success("", oldLogisticsModel);
+        }
+
+
+        /// <summary>
+        /// 保存司导导游信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult AddOrUpdateGuideCarGuide()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_GuideCar_Guide_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            query.IsEnable = 0;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入站点信息");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(query.Name))
+                {
+                    return ApiResult.Failed("请输入导游名称");
+                }
+                if (string.IsNullOrWhiteSpace(query.GuidePhoto))
+                {
+                    return ApiResult.Failed("请上传导游头像");
+                }
+                if (string.IsNullOrWhiteSpace(query.Telephone))
+                {
+                    return ApiResult.Failed("请输入联系电话");
+                }
+                if (string.IsNullOrWhiteSpace(query.EmergencyPhone))
+                {
+                    return ApiResult.Failed("请输入紧急联系电话");
+                }
+                if (query.SiteId == 0)
+                {
+                    return ApiResult.Failed("请选择站点信息");
+                }
+                if (string.IsNullOrWhiteSpace(query.Introduction))
+                {
+                    return ApiResult.Failed("请输入间接");
+                }
+
+                query.TenantId = UserInfo.TenantId;
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                query.UpdateDate = System.DateTime.Now;
+                bool result = guideCarModule.AddOrUpdateGuideCarGuide(query);
+                if (result)
+                {
+                    return ApiResult.Success("导游信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("导游信息保存失败");
+                }
+            }
+        }
         #endregion
     }
 }
\ No newline at end of file