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.Product/OrderModule.cs

@@ -2689,6 +2689,11 @@ namespace Mall.Module.Product
                                     }
                                 }
                             }
+
+                            if (dcList.Where(x => x.SmallShopId > 0).Any())
+                            {
+                                IsCommissionCoupons = false;
+                            }
                         }
                     }
                 }

Mall.Module.Product/ProductModule.cs

@@ -1489,6 +1489,11 @@ namespace Mall.Module.Product
                 }
                 MaxSellMoney = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0);
                 model.SellingPrice = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
+                decimal MaxPrice = MaxSellMoney + Math.Ceiling(MaxSellMoney / 10);
+                if (MaxPrice > model.OriginalPrice)
+                {
+                    model.OriginalPrice = MaxPrice;
+                }
             }
             //区域
             model.AreaList = new List<RB_Goods_Area_Extend>();

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.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