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

Mall.Model/Entity/MarketingCenter/RB_Deposit.cs

+using VT.FW.DB;
+using Mall.Common.Enum.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 存储卡实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Deposit
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+        public string Name { get; set; }
+
+        public string CouponIco { get; set; }
+
+        /// <summary>
+        /// 售价
+        /// </summary>
+        public decimal SalePrice { get; set; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal DepositPrice { get; set; }
+
+        /// <summary>
+        /// 有效天数
+        /// </summary>
+        public int IndateDay { get; set; }
+
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Describe { get; set; }
+
+
+
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_Deposit_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    public class RB_Deposit_Extend: Entity.MarketingCenter.RB_Deposit
+    {
+
+    }
+}

Mall.Module.MarketingCenter/CouponModule.cs

@@ -21,6 +21,7 @@ namespace Mall.Module.MarketingCenter
     public class CouponModule
     {
         private readonly RB_CouponRepository couponRepository = new RB_CouponRepository();
+        private readonly RB_DepositRepository depositRepository = new RB_DepositRepository();
         private readonly RB_DiscountCouponRepository discountCouponRepository = new RB_DiscountCouponRepository();
         private readonly RB_DiscountCoupon_ProductRepository productRepository = new RB_DiscountCoupon_ProductRepository();
 
@@ -288,7 +289,7 @@ namespace Mall.Module.MarketingCenter
                         OperatorEnum=OperatorEnum.Equal
                 }
                 };
-                flag = discountCouponRepository.Update(cols1, wheres1);
+                flag = discountCouponRepository.Update(cols1, wheres1, trans);
 
                 Dictionary<string, object> cols = new Dictionary<string, object>()
                     {
@@ -312,7 +313,7 @@ namespace Mall.Module.MarketingCenter
                         OperatorEnum=OperatorEnum.Equal
                 }
                 };
-                productRepository.Update(cols, wheres);
+                productRepository.Update(cols, wheres, trans);
 
 
                 discountCouponRepository.DBSession.Commit();
@@ -889,7 +890,7 @@ namespace Mall.Module.MarketingCenter
             }
             //根据发放类型获取对应的优惠券信息
             model.SmallShopId = memberUserModel.SmallShopId;
-            if (model.TriggerType == 4|| model.TriggerType==5)
+            if (model.TriggerType == 4 || model.TriggerType == 5)
             {
                 model.RegisterDate = memberUserModel.CreateDate;
             }
@@ -898,7 +899,7 @@ namespace Mall.Module.MarketingCenter
             {
                 bool isReceive = false;
                 //查询已发放的优惠券信息
-                var memberCouponList = memberCouponRepository.GetAutoMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { UserId = model.UserId, GetType = model.TriggerType,KeyWord= model.KeyWord, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
+                var memberCouponList = memberCouponRepository.GetAutoMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { UserId = model.UserId, GetType = model.TriggerType, KeyWord = model.KeyWord, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
                 foreach (var item in couponList.Where(x => x.TotalNum == -1 || x.TotalNum > 0))//判断当前优惠券是否已超过领取数
                 {
                     int membercouponCoun = memberCouponList.Where(x => x.CouponId == item.ID).Count();
@@ -989,5 +990,119 @@ namespace Mall.Module.MarketingCenter
         }
         #endregion
 
+
+        #region 存储卡
+        /// <summary>
+        /// 存储卡信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Deposit_Extend> GetDepositPageList(int pageIndex, int pageSize, out long rowCount, RB_Deposit_Extend query)
+        {
+            return depositRepository.GetDepositPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 存储卡信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Deposit_Extend> GetDepositList(RB_Deposit_Extend query)
+        {
+            var list = depositRepository.GetDepositList(query);
+
+            return list;
+        }
+
+        /// <summary>
+        /// 新增/修改存储卡
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetDeposit(RB_Deposit_Extend model)
+        {
+            bool flag = false;
+            try
+            {
+                if (model.ID == 0)
+                {
+                    flag = depositRepository.Insert(model) > 0;
+                }
+                else
+                {
+                    IDictionary<string, object> fileds = new Dictionary<string, object>()
+                         {
+                            { nameof(RB_Deposit_Extend.Name),model.Name},
+                             { nameof(RB_Deposit_Extend.IndateDay),model.IndateDay},
+                               { nameof(RB_Deposit_Extend.CouponIco),model.CouponIco},
+                                 { nameof(RB_Deposit_Extend.DepositPrice),model.DepositPrice},
+                                   { nameof(RB_Deposit_Extend.Describe),model.Describe},
+                                    { nameof(RB_Deposit_Extend.SalePrice),model.SalePrice},
+                          };
+                    IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_Deposit_Extend.ID),FiledValue=model.ID,OperatorEnum=OperatorEnum.Equal}
+                        };
+                    flag = depositRepository.Update(fileds, whereHelpers);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "SetDeposit");
+                return false;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除存储卡
+        /// </summary>
+        /// <param name="gradeId"></param>
+        /// <param name="uid"></param>
+        /// <returns></returns>
+        public bool DelDeposit(int id, int uid, int mallBaseId)
+        {
+
+            bool flag;
+            try
+            {
+                Dictionary<string, object> cols1 = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_Deposit_Extend.Status),1},
+                        { nameof(RB_Deposit_Extend.UpdateDate),DateTime.Now},
+                    };
+                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Deposit_Extend.ID),
+                        FiledValue=id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Deposit_Extend.TenantId),
+                        FiledValue=Convert.ToInt32(uid),
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Deposit_Extend.MallBaseId),
+                        FiledValue=Convert.ToInt32(mallBaseId),
+                        OperatorEnum=OperatorEnum.Equal
+                }
+                };
+                flag = depositRepository.Update(cols1, wheres1);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelDeposit");
+                return false;
+            }
+            return flag;
+        }
+
+
+        #endregion
+
     }
 }

Mall.Repository/MarketingCenter/RB_DepositRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+
+namespace Mall.Repository.MarketingCenter
+{
+    public class RB_DepositRepository : BaseRepository<RB_Deposit>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Deposit); } }
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Deposit_Extend> GetDepositPageList(int pageIndex, int pageSize, out long rowCount, RB_Deposit_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Deposit_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return GetPage<RB_Deposit_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 卡券信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Deposit_Extend> GetDepositList(RB_Deposit_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Deposit_Extend.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Deposit_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return Get<RB_Deposit_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

@@ -408,10 +408,10 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 {
                     memberList = UserModule.GetMemberUserList(new RB_Member_User_Extend { TenantId = UserInfo.TenantId, MallBaseId = parms.MallBaseId, UserIds = query.UserIds });
 
-                    var notSmallShopList = memberList.Where(x=>x.SmallShopId!= oldLogisticsModel.SmallShopId);
-                    if (notSmallShopList!=null&& notSmallShopList.Any())
+                    var notSmallShopList = memberList.Where(x => x.SmallShopId != oldLogisticsModel.SmallShopId);
+                    if (notSmallShopList != null && notSmallShopList.Any())
                     {
-                        return ApiResult.Failed(string.Join(",", notSmallShopList.Select(x=>x.Name)+"不属于当前店铺"));
+                        return ApiResult.Failed(string.Join(",", notSmallShopList.Select(x => x.Name) + "不属于当前店铺"));
                     }
                 }
                 List<RB_Member_DiscountCoupon_Extend> list = new List<RB_Member_DiscountCoupon_Extend>();
@@ -848,5 +848,129 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             return ApiResult.Success("", pagelist);
         }
         #endregion
+
+
+        #region 储值卡
+        [HttpPost]
+        public ApiResult GetDepositPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            RB_Deposit_Extend demodel = JsonConvert.DeserializeObject<RB_Deposit_Extend>(RequestParm.msg.ToString());
+            demodel.TenantId = UserInfo.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = IntegralModule.GetDepositPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.Name,
+                x.SalePrice,
+                x.CouponIco,
+                x.DepositPrice,
+                x.IndateDay,
+                x.Describe
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 获取储值卡详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDepositList()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Deposit_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsModel = IntegralModule.GetDepositList(query).FirstOrDefault();
+            if (oldLogisticsModel == null)
+            {
+                oldLogisticsModel = new RB_Deposit_Extend();
+            }
+            return ApiResult.Success("", oldLogisticsModel);
+        }
+
+        /// <summary>
+        /// 保存储值卡
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSetDeposit()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Deposit_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入储值卡信息");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(query.Name))
+                {
+                    return ApiResult.Failed("请输入储值卡名称");
+                }
+
+                if (query.IndateDay == 0)
+                {
+                    return ApiResult.Failed("请输入有效期天数");
+                }
+                if (query.SalePrice <= 0)
+                {
+                    return ApiResult.Failed("请输入售价");
+                }
+                if (query.DepositPrice <= 0)
+                {
+                    return ApiResult.Failed("请输入价格");
+                }
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+
+                query.UpdateDate = System.DateTime.Now;
+                bool result = IntegralModule.SetDeposit(query);
+                if (result)
+                {
+                    return ApiResult.Success("储值卡信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("储值卡信息保存失败");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 删除储值卡
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelDeposit()
+        {
+            var parms = RequestParm;
+            JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parmsJob.GetInt("Id", 0);
+            if (Id <= 0)
+            {
+                return ApiResult.Failed("请传递参数");
+            }
+            bool flag = IntegralModule.DelDeposit(Id, UserInfo.TenantId, parms.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        #endregion
     }
 }
\ No newline at end of file