Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/MarketingCenter/RB_Share_Friend.cs

@@ -97,5 +97,10 @@ namespace Mall.Model.Entity.MarketingCenter
         /// 更新时间
         /// </summary>
         public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 分享数量
+        /// </summary>
+        public int ShareCount { get; set; }
     }
 }

Mall.Module.MarketingCenter/ShareModule.cs

@@ -348,5 +348,15 @@ namespace Mall.Module.MarketingCenter
             flag = share_FriendRepository.Update(fileds, new WhereHelper(nameof(RB_Share_Friend_Extend.Id), Id));
             return flag;
         }
+
+        /// <summary>
+        /// 更新分享数量
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool SetShareFrendShareCountModule(object Id)
+        {
+            return share_FriendRepository.SetShareFrendShareCountRepository(Id);
+        }
     }
 }

Mall.Module.User/UserModule.cs

@@ -6379,14 +6379,14 @@ namespace Mall.Module.User
             }
 
             //已提现佣金 //未结算佣金
-            var commModel = distributor_RemitRepository.GetDistributorCommissionStatiscs(userInfo.UserId);
+            var commModel = smallShopsRemitRepository.GetDistributorCommissionStatiscs(userInfo.UserId);
             //提现总额
-            var remitMoney = distributor_RemitRepository.GetDistributorRemitCommission(userInfo.UserId);
+            var remitMoney = smallShopsRemitRepository.GetDistributorRemitCommission(userInfo.UserId);
 
             //分销订单
             decimal OrderCommission = smallShopsCommissionRepository.GetUserOrderCommissionStatistics(userInfo.UserId);
             //未结算返佣
-            decimal WJSCommission = goods_OrderCommissionRepository.GetUserOrderCommissionNoSettlement(userInfo.UserId);
+            decimal WJSCommission = smallShopsCommissionRepository.GetSmallShopsCommissionNoSettlement(userInfo.UserId);
 
 
 

Mall.Repository/MarketingCenter/RB_Share_FriendRepository.cs

@@ -22,7 +22,7 @@ namespace Mall.Repository.MarketingCenter
         /// <param name="query">查询条件</param>
         /// <param name="IsUse">true-只查询启用的</param>
         /// <returns></returns>
-        public List<RB_Share_Friend_Extend> GetShareFriendPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Share_Friend_Extend query,bool IsUse=false)
+        public List<RB_Share_Friend_Extend> GetShareFriendPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Share_Friend_Extend query, bool IsUse = false)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -46,7 +46,7 @@ WHERE 1=1 AND A.Status=0
                 }
                 if (query.CateId > 0)
                 {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.CateId),query.CateId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.CateId), query.CateId);
                 }
                 if (!string.IsNullOrWhiteSpace(query.CateIds))
                 {
@@ -192,7 +192,7 @@ WHERE 1=1 AND A.Status=0
                 dynamicParameters.Add("UpdateBy", extModel.UpdateBy);
                 dynamicParameters.Add("UpdateDate", extModel.UpdateDate);
                 dynamicParameters.Add("Id", extModel.Id);
-                flag = base.Execute(builder.ToString(),dynamicParameters) > 0;
+                flag = base.Execute(builder.ToString(), dynamicParameters) > 0;
             }
             else
             {
@@ -218,5 +218,21 @@ WHERE 1=1 AND A.Status=0
             }
             return flag;
         }
+
+        /// <summary>
+        /// 更新分享数量
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool SetShareFrendShareCountRepository(object Id)
+        {
+            bool flag = false;
+            DynamicParameters dynamicParameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@" UPDATE rb_share_friend SET shareCount=shareCount+1 WHERE Id=@Id ");
+            dynamicParameters.Add("Id", Id);
+            flag = base.Execute(builder.ToString(), dynamicParameters) > 0;
+            return flag;
+        }
     }
 }
\ No newline at end of file

Mall.Repository/Product/RB_SmallShops_CommissionRepository.cs

@@ -193,6 +193,28 @@ left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and o
             return 0;
         }
 
+
+        /// <summary>
+        /// 用户未结算返佣
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public decimal GetSmallShopsCommissionNoSettlement(int userId)
+        {
+            string sql = $@"SELECT SUM(Commission) as Commission FROM RB_SmallShops_Commission oc
+INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
+left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
+ WHERE oc.UserId={userId} and oc.CommissionState=1 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null";
+
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToDecimal(obj);
+            }
+            return 0;
+        }
+
+
         /// <summary>
         /// 获取未提现的佣金列表
         /// </summary>

Mall.Repository/User/RB_SmallShops_InfoRepository.cs

@@ -87,10 +87,20 @@ where {where} order by di.CreateDate desc";
             {
                 where += $@" and di.{nameof(RB_SmallShops_Info_Extend.UserId)}={dmodel.UserId}";
             }
+            //if (dmodel.IsSelectAuditStatus == 1)
+            //{
+            //    if (dmodel.AuditStatus > 0)
+            //    {
+            //        where += $@" and di.{nameof(RB_SmallShops_Info_Extend.AuditStatus)} in(1,2)";
+            //    }
+            //}
+            //else {
             if (dmodel.AuditStatus > 0)
             {
                 where += $@" and di.{nameof(RB_SmallShops_Info_Extend.AuditStatus)}={(int)dmodel.AuditStatus}";
             }
+            // }
+
             if (dmodel.GradeId >= 0)
             {
                 where += $@" and di.{nameof(RB_SmallShops_Info_Extend.GradeId)}={dmodel.GradeId}";

Mall.WebApi/Controllers/MarketingCenter/ShareController.cs

@@ -157,11 +157,14 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 qitem.ImgList,
                 qitem.CoverImg,
                 qitem.LinkUrl,
-                qitem.CreateDateStr
+                qitem.CreateDateStr,
+                qitem.ShareCount,
             });
             return ApiResult.Success("", pagelist);
         }
 
+        
+
         /// <summary>
         /// 获取分享详情列表
         /// </summary>
@@ -273,5 +276,18 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             bool flag = shareModule.SetShareFriendMaterialInfoModule(Id, MaterialInfo);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 更新分享数量
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        public ApiResult SetShareCount()
+        {
+            JObject parm = JObject.Parse(RequestParm.msg.ToString());
+            int Id = parm.GetInt("Id", 0);
+            bool flag = shareModule.SetShareFrendShareCountModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1183,7 +1183,7 @@ namespace Mall.WebApi.Controllers.User
             var userInfo = AppletUserInfo;
             JObject prams = JObject.Parse(req.msg.ToString());
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
-            var createDateStr = prams.GetStringValue("CreateDate")+"-01";
+            var createDateStr = prams.GetStringValue("CreateDate") + "-01";
             RB_Member_Balance_Extend demodel = new RB_Member_Balance_Extend();
             if (!string.IsNullOrWhiteSpace(createDateStr))
             {
@@ -1785,6 +1785,17 @@ namespace Mall.WebApi.Controllers.User
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             RB_SmallShops_Info_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Info_Extend>(req.msg.ToString());
+
+            var memberModel = userModule.GetMemberUserInfo(userInfo.UserId);
+            if (memberModel == null)
+            {
+                return ApiResult.Failed("用户信息不存在");
+            }
+
+            if (memberModel.SmallShopId > 0)
+            {
+                return ApiResult.Failed("当前不满足申请资格，请联系客服");
+            }
             //判断是否满足当前申请条件
             var microShopBasics = MallBaseModule.GetMicroShopBasicsList(new Model.Entity.BaseSetUp.RB_MicroShop_Basics { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
 
@@ -1855,6 +1866,10 @@ namespace Mall.WebApi.Controllers.User
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.CreateDate = DateTime.Now;
             demodel.UpdateDate = DateTime.Now;
+            demodel.TotalCommission = 0;
+            demodel.Commission = 0;
+            demodel.UpPrice = 0;
+            demodel.PriceType = 0;
             demodel.Status = 0;
             demodel.AuditStatus = microShopBasics.IsExamine == 1 ? DistributorAuditStatusEnum.Audited : DistributorAuditStatusEnum.Auditing;
             bool flag = userModule.ApplySmallShopsInfo(demodel);
@@ -2086,7 +2101,7 @@ namespace Mall.WebApi.Controllers.User
             {
                 model = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, Id = query.Id }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
             }
-            if (model==null)
+            if (model == null)
             {
                 model = new RB_SmallShops_Info_Extend();
             }