提交代码

Mall.Common/API/AppletUserInfo.cs

@@ -104,5 +104,11 @@ namespace Mall.Common
         /// SecretKey
         /// </summary>
         public string SecretKey { get; set; }
+
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public Common.Enum.Goods.GoodsPageTypeEnum? UserPageType { get; set; }
     }
 }
\ No newline at end of file

Mall.Common/Enum/Goods/GoodsPageTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.Goods
+{
+    /// <summary>
+    /// 商品上架版面类型枚举
+    /// </summary>
+    public enum GoodsPageTypeEnum
+    {
+        /// <summary>
+        /// 全部
+        /// </summary>
+        [EnumField("全部")]
+        All = 0,
+
+        /// <summary>
+        /// 商城
+        /// </summary>
+        [EnumField("商城")]
+        Mall = 1,
+        /// <summary>
+        /// 校园
+        /// </summary>
+        [EnumField("校园")]
+        School = 2,
+
+    }
+}

Mall.Model/Entity/Product/RB_Goods.cs

@@ -383,6 +383,11 @@ namespace Mall.Model.Entity.Product
 
 
 
+        /// <summary>
+        /// 上架版面
+        /// </summary>
+        public GoodsPageTypeEnum? GoodsPageType { get; set; }
+
         /// <summary>
         /// 供应商id
         /// </summary>
@@ -535,5 +540,10 @@ namespace Mall.Model.Entity.Product
             get;
             set;
         }
+
+        /// <summary>
+        /// 商品备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Product_Category.cs

@@ -154,5 +154,10 @@ namespace Mall.Model.Entity.Product
         /// 是否对外分享  1是  2否
         /// </summary>
         public int? IsForeignShare { get; set; }
+
+        /// <summary>
+        /// 上架版面
+        /// </summary>
+        public Common.Enum.Goods.GoodsPageTypeEnum? CategoryPageType { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Member_User.cs

@@ -219,5 +219,10 @@ namespace Mall.Model.Entity.User
         /// 职位Id,(1-领队导游)
         /// </summary>
         public int PostId { get; set; }
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public Common.Enum.Goods.GoodsPageTypeEnum? UserPageType { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Product_Category_Extend.cs

@@ -49,12 +49,19 @@ namespace Mall.Model.Extend.Product
         /// 上2级名称
         /// </summary>
         public string Parent2Name { get; set; }
+
+
+        /// <summary>
+        /// 版面类型
+        /// </summary>
+        public string CategoryPageTypeStr { get; set; }
     }
 
     /// <summary>
     /// 树形结构
     /// </summary>
-    public class RB_Product_CategoryTree { 
+    public class RB_Product_CategoryTree
+    {
         /// <summary>
         /// id
         /// </summary>
@@ -79,7 +86,8 @@ namespace Mall.Model.Extend.Product
     /// <summary>
     /// 分类排序
     /// </summary>
-    public class RB_Product_CategorySort { 
+    public class RB_Product_CategorySort
+    {
         /// <summary>
         /// id
         /// </summary>

Mall.Model/Query/OrderStatistics_Query.cs

@@ -323,5 +323,28 @@ namespace Mall.Model.Query
         /// </summary>
         public decimal ServiceCharge { get; set; }
 
+
+        /// <summary>
+        /// 保险收入
+        /// </summary>
+        public decimal InsuranceMoney { get; set; }
+
+
+
+        /// <summary>
+        /// 保险成本
+        /// </summary>
+        public decimal InsuranceCostMoney { get; set; }
+
+        /// <summary>
+        /// 出行类型
+        /// </summary>
+        public int CarType { get; set; }
+
+        /// <summary>
+        /// 订单类型0-正常订单，1-司导订单
+        /// </summary>
+
+        public int OrderClassify { get; set; }
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -3097,6 +3097,7 @@ namespace Mall.Module.Product
                     item.IconPath = mlist.Where(x => x.Id == item.Icon).FirstOrDefault()?.Path ?? "";
                     item.BigIconPath = mlist.Where(x => x.Id == item.BigIcon).FirstOrDefault()?.Path ?? "";
                     item.AdvertisingImagePath = mlist.Where(x => x.Id == item.AdvertisingImage).FirstOrDefault()?.Path ?? "";
+                    item.CategoryPageTypeStr = item.CategoryPageType.GetEnumName();
                 }
                 list = list.OrderBy(x => x.Sort).ThenBy(x => x.Id).ToList();
                 treeList = GetProductCategoryChildTree(list, 0);
@@ -3149,7 +3150,8 @@ namespace Mall.Module.Product
                     { nameof(RB_Product_Category.Name),demodel.Name},
                     { nameof(RB_Product_Category.Sort),demodel.Sort},
                     { nameof(RB_Product_Category.IsForeignShare),demodel.IsForeignShare},
-                    { nameof(RB_Product_Category.UpdateDate),demodel.UpdateDate}
+                    { nameof(RB_Product_Category.UpdateDate),demodel.UpdateDate},
+                    { nameof(RB_Product_Category.CategoryPageType),demodel.CategoryPageType},
                 };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
                     new WhereHelper(){
@@ -4643,6 +4645,8 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.VideoType),demodel.VideoType },
                         { nameof(RB_Goods.IntegralComment),demodel.IntegralComment },
                         { nameof(RB_Goods.IntegralCommentType),demodel.IntegralCommentType },
+                        { nameof(RB_Goods.Remark),demodel.Remark },
+                        { nameof(RB_Goods.GoodsPageType),demodel.GoodsPageType },
                     };
                     if (goodsModel.IsProcurement == 1)
                     {

Mall.Module.User/SmallShopsModule.cs

@@ -172,7 +172,7 @@ namespace Mall.Module.User
         /// <param name="ssmodel"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public bool SetSmallShopsAudit(RB_SmallShops_Info_Extend ssmodel, int type)
+        public bool SetSmallShopsAudit(RB_SmallShops_Info_Extend ssmodel, int type, RB_Member_User_Extend memberModel)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_SmallShops_Info.UpdateDate),DateTime.Now}
@@ -206,8 +206,21 @@ namespace Mall.Module.User
                        OperatorEnum=OperatorEnum.Equal
                 }
             };
-
-            return smallShops_InfoRepository.Update(keyValues, wheres);
+            bool result = smallShops_InfoRepository.Update(keyValues, wheres);
+            if (type == 1 && result && memberModel.SmallShopId > 0)
+            {
+                IDictionary<string, object> fileds = new Dictionary<string, object>()
+                        {
+                        { nameof(RB_Member_User.Remark),memberModel.Remark},
+                        { nameof(RB_Member_User.SmallShopId),0}
+                        };
+                IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_Member_User.Id),FiledValue=memberModel.Id,OperatorEnum=OperatorEnum.Equal}
+                        };
+                return member_UserRepository.Update(fileds, whereHelpers);
+            }
+            return result;
         }
 
         /// <summary>
@@ -217,7 +230,7 @@ namespace Mall.Module.User
         /// <param name="commission"></param>
         /// <param name="empId"></param>
         /// <returns></returns>
-        public bool SetSmallShopsCommission(int smallShopsId, decimal commission,int empId)
+        public bool SetSmallShopsCommission(int smallShopsId, decimal commission, int empId)
         {
             var model = smallShops_InfoRepository.GetEntity(smallShopsId);
             if (model == null) { return false; }
@@ -937,7 +950,8 @@ namespace Mall.Module.User
                                         {
                                             ssPrice += Math.Ceiling(ssPrice * (ssmodel.UpPrice ?? 0) / 100);
                                         }
-                                        else {
+                                        else
+                                        {
                                             ssPrice += (ssmodel.UpPrice ?? 0);
                                         }
                                     }
@@ -973,7 +987,8 @@ namespace Mall.Module.User
                                 {
                                     ssPrice += Math.Ceiling(ssPrice * (ssmodel.UpPrice ?? 0) / 100);
                                 }
-                                else {
+                                else
+                                {
                                     ssPrice += (ssmodel.UpPrice ?? 0);
                                 }
                             }

Mall.Module.User/UserModule.cs

@@ -2459,7 +2459,8 @@ namespace Mall.Module.User
                                 var ocModel = oclist.Where(x => x.OrderDetailId == qitem.Id).FirstOrDefault();
                                 if (ocModel != null)
                                 {
-                                    if (ocModel.Commission > 0) {
+                                    if (ocModel.Commission > 0)
+                                    {
                                         detailList.Add(new
                                         {
                                             CostTypeId = item.RemitCostTypeId,
@@ -2470,9 +2471,11 @@ namespace Mall.Module.User
                                         });
                                     }
                                 }
-                                else {
+                                else
+                                {
                                     var vipModel = vipbuycList.Where(x => x.ReOrderId == qitem.OrderId).FirstOrDefault();
-                                    if (vipModel != null && vipModel.Commission > 0) {
+                                    if (vipModel != null && vipModel.Commission > 0)
+                                    {
                                         detailList.Add(new
                                         {
                                             CostTypeId = item.RemitCostTypeId,
@@ -4020,7 +4023,7 @@ namespace Mall.Module.User
         /// <param name="userInfo"></param>
         /// <param name="IsDirect">默认查询直属下线</param>
         /// <returns></returns>
-        public object GerUserMyTeamTitelListForFX(AppletUserInfo userInfo,int IsDirect=1)
+        public object GerUserMyTeamTitelListForFX(AppletUserInfo userInfo, int IsDirect = 1)
         {
             string UserIds = member_UserRepository.GetMemberChildIdStr(userInfo.UserId);
             var query = new RB_Distributor_Info_Extend()
@@ -6390,11 +6393,25 @@ namespace Mall.Module.User
 
 
 
-        public bool ApplySmallShopsInfo(RB_SmallShops_Info_Extend model)
+        public bool ApplySmallShopsInfo(RB_SmallShops_Info_Extend model, RB_Member_User_Extend memberModel)
         {
             if (model.Id == 0)
             {
-                return smallShopsInfoRepository.Insert(model) > 0;
+                bool result = smallShopsInfoRepository.Insert(model) > 0;
+                if (memberModel.SmallShopId > 0&& result)
+                {
+                    IDictionary<string, object> fileds = new Dictionary<string, object>()
+                        {
+                        { nameof(RB_Member_User.Remark),memberModel.Remark},
+                        { nameof(RB_Member_User.SmallShopId),0}
+                        };
+                    IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_Member_User.Id),FiledValue=memberModel.Id,OperatorEnum=OperatorEnum.Equal}
+                        };
+                    return member_UserRepository.Update(fileds, whereHelpers);
+                }
+                return result;
             }
             return false;
         }

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -554,7 +554,17 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
             {
                 where += $@" and IFNULL(g.{nameof(RB_Goods_Extend.VideoAddress)},'') <>'' ";
             }
-
+            if (dmodel.GoodsPageType.HasValue)
+            {
+                if (dmodel.GoodsPageType == Common.Enum.Goods.GoodsPageTypeEnum.Mall)
+                {
+                    where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,1)";
+                }
+                else if (dmodel.GoodsPageType == Common.Enum.Goods.GoodsPageTypeEnum.School)
+                {
+                    where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,2)";
+                }
+            }
             //默认综合【升序】
             string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc";
             //上架时间【降序】

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1410,7 +1410,7 @@ GROUP BY od.GoodsId,o.OrderId
             //GROUP BY b.Id order by b.Id desc";
 
 
-            string sql = $@"    SELECT a.OrderStatus,B.Id,b.ServiceCharge,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
+            string sql = $@"    SELECT a.OrderStatus,sum(b.InsuranceCostMoney) as InsuranceCostMoney,sum(b.InsuranceMoney) as InsuranceMoney,b.CarType,a.OrderClassify,B.Id,b.ServiceCharge,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
 SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
 SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,sum(b.FreightCostMoney) as GoodsFreight,
 0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney

Mall.Repository/Product/RB_Product_CategoryRepository.cs

@@ -103,7 +103,17 @@ namespace Mall.Repository.Product
             {
                 where += $@" and {nameof(RB_Product_Category_Extend.IsShow)}={dmodel.IsShow}";
             }
-
+            if (dmodel.CategoryPageType.HasValue)
+            {
+                if (dmodel.CategoryPageType==Common.Enum.Goods.GoodsPageTypeEnum.Mall)
+                {
+                    where += $@" and {nameof(RB_Product_Category_Extend.CategoryPageType)} in(0,1)";
+                }
+                else if (dmodel.CategoryPageType == Common.Enum.Goods.GoodsPageTypeEnum.School)
+                {
+                    where += $@" and {nameof(RB_Product_Category_Extend.CategoryPageType)} in(0,2)";
+                }           
+            }
             string sql = $@"select * from RB_Product_Category where {where} order by Id asc";
             return Get<RB_Product_Category_Extend>(sql).ToList();
         }

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -160,7 +160,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                     item.RefundActual = item.RefundActual > 0 ? item.RefundActual : item.AllPrice;
                 }
                 item.ALLCommission = item.CostMoney + item.GoodsFreight  + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
-               // item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
+                //item.ALLCommission =item.CostMoney + item.GoodsFreight + item.InsuranceCostMoney + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
                 item.NoPaid = item.ALLCommission;
                 item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
                 item.Paid =  item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -399,6 +399,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.IsShow,
                 x.TenantId,
                 x.MallBaseId,
+                CategoryPageTypeStr=  x.CategoryPageType.GetEnumName(),
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""
             });
             return ApiResult.Success("", pagelist);
@@ -458,6 +459,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 model.TenantId,
                 model.MallBaseId,
                 model.IsForeignShare,
+                model.CategoryPageType,
                 CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd") : ""
             });
         }
@@ -668,7 +670,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetProductCategoryShow() {
+        public ApiResult SetProductCategoryShow()
+        {
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
             int IsShow = parms.GetInt("IsShow", 2);//2 显示 1隐藏
@@ -678,7 +681,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -1154,14 +1158,14 @@ namespace Mall.WebApi.Controllers.MallBase
             JObject parameters = JObject.Parse(RequestParm.msg.ToString());
             RB_Goods_Extend demodel = new RB_Goods_Extend()
             {
-                Name=parameters.GetStringValue("Name"),
-                GoodsStatus=parameters.GetInt("GoodsStatus"),
-                IsSelectSellOut=parameters.GetInt("IsSelectSellOut"),
-                CategoryIds=parameters.GetStringValue("CategoryIds"),
-                Id=parameters.GetInt("Id"),
-                StartTime=parameters.GetStringValue("StartTime"),
-                EndTime=parameters.GetStringValue("EndTime"),
-                OrderBy=parameters.GetInt("OrderBy")
+                Name = parameters.GetStringValue("Name"),
+                GoodsStatus = parameters.GetInt("GoodsStatus"),
+                IsSelectSellOut = parameters.GetInt("IsSelectSellOut"),
+                CategoryIds = parameters.GetStringValue("CategoryIds"),
+                Id = parameters.GetInt("Id"),
+                StartTime = parameters.GetStringValue("StartTime"),
+                EndTime = parameters.GetStringValue("EndTime"),
+                OrderBy = parameters.GetInt("OrderBy")
             };
 
             demodel.TenantId = parms.TenantId;
@@ -1187,7 +1191,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.TenantId,
                 x.MallBaseId,
                 x.SendArea,
-                CarouselImageList= x.CarouselImageList.Select(qitem=>qitem.Path).ToList(),
+                x.Remark,
+                GoodsPageTypeStr = x.GoodsPageType.GetEnumName(),
+                CarouselImageList = x.CarouselImageList.Select(qitem => qitem.Path).ToList(),
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);
@@ -1548,6 +1554,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     model?.Commission,
                     model?.IsLiveGoods,
                     model?.SendArea,
+                    model?.Remark,
+                    model?.GoodsPageType,
                     CategoryList = model?.CategoryList.Select(x => new
                     {
                         x.Id,
@@ -2108,6 +2116,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.SubName ??= "";//副标题
             demodel.IsLiveGoods ??= 2;//是否直播商品  1是  2否
             demodel.SendArea ??= "";//发货地
+            demodel.Remark ??= "";//发货地
             demodel.GoodsClassify = 0;
             demodel.IntegralComment ??= 0;//评论反积分
             demodel.IntegralCommentType ??= 1;
@@ -2255,6 +2264,22 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
+
+        /// <summary>
+        /// 获取商品版面类型枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GoodsPageTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.Goods.GoodsPageTypeEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
         #endregion
 
         #region 商品代理

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -187,7 +187,8 @@ namespace Mall.WebApi.Controllers.User
                         SuperiorId = demodel.SuperiorId ?? 0,
                         Token = token,
                         SmallShopId = 0,
-                        UserSmallShopId= demodel.SmallShopId
+                        UserSmallShopId= demodel.SmallShopId,
+                        UserPageType= demodel.UserPageType
                     };
                     UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
                     if (couponResult != null && couponResult.ID > 0)
@@ -255,7 +256,8 @@ namespace Mall.WebApi.Controllers.User
                     SuperiorId = umodel.SuperiorId ?? 0,
                     Token = token,
                     SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0,
-                    UserSmallShopId = umodel.SmallShopId
+                    UserSmallShopId = umodel.SmallShopId,
+                    UserPageType = demodel.UserPageType
                 };
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
                 return ApiResult.CouponSuccess(ResultCode.Fail, 1,"", "", appletUserInfo);

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -732,7 +732,7 @@ namespace Mall.WebApi.Controllers.User
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
             //是否直属
-            int IsDirect= parms.GetInt("IsDirect", 0);
+            int IsDirect = parms.GetInt("IsDirect", 0);
             var obj = userModule.GerUserMyTeamTitelListForFX(userInfo, IsDirect: IsDirect);
             return ApiResult.Success("", obj);
         }
@@ -758,9 +758,9 @@ namespace Mall.WebApi.Controllers.User
             if (parms.GetInt("NewUserId") > 0)
             {
                 demodel.UserId = parms.GetInt("NewUserId");
-                NewUserId= parms.GetInt("NewUserId");
+                NewUserId = parms.GetInt("NewUserId");
             }
-            var list= userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel,NewUserId: NewUserId);
+            var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel, NewUserId: NewUserId);
 
 
             pageModel.count = Convert.ToInt32(count);
@@ -1091,7 +1091,7 @@ namespace Mall.WebApi.Controllers.User
                 }
                 if (allMemberInfo.SmallShopId == 0)
                 {
-                    if (oldLogisticsModel.SmallShopId > 0 )
+                    if (oldLogisticsModel.SmallShopId > 0)
                     {
                         return ApiResult.Failed("您不属于当前店铺");
                     }
@@ -1253,11 +1253,11 @@ namespace Mall.WebApi.Controllers.User
             }
             if (resultModel != null && resultModel.ID > 0)
             {
-                return ApiResult.CouponSuccess(ResultCode.Success,1, "",resultModel.Name);
+                return ApiResult.CouponSuccess(ResultCode.Success, 1, "", resultModel.Name);
             }
             else
             {
-                return ApiResult.CouponFailed(ResultCode.Fail,1, "","");
+                return ApiResult.CouponFailed(ResultCode.Fail, 1, "", "");
             }
 
             //RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
@@ -1929,10 +1929,10 @@ namespace Mall.WebApi.Controllers.User
                 return ApiResult.Failed("用户信息不存在");
             }
 
-            if (memberModel.SmallShopId > 0)
-            {
-                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();
 
@@ -2009,7 +2009,11 @@ namespace Mall.WebApi.Controllers.User
             demodel.PriceType = 0;
             demodel.Status = 0;
             demodel.AuditStatus = microShopBasics.IsExamine == 1 ? DistributorAuditStatusEnum.Audited : DistributorAuditStatusEnum.Auditing;
-            bool flag = userModule.ApplySmallShopsInfo(demodel);
+            if (microShopBasics.IsExamine == 1 && memberModel.SmallShopId > 0)
+            {
+                memberModel.Remark += "原店铺ID:" + memberModel.SmallShopId;
+            }
+            bool flag = userModule.ApplySmallShopsInfo(demodel, memberModel);
             if (flag)
             {
                 return ApiResult.Success();

Mall.WebApi/Controllers/User/SmallShopsController.cs

@@ -209,7 +209,13 @@ namespace Mall.WebApi.Controllers.User
             }
 
             ssmodel.Remark = Remark;
-            bool flag = smallShopsModule.SetSmallShopsAudit(ssmodel, Type);
+
+            var memberUserModel = userModule.GetMemberUserInfo(ssmodel.UserId ?? 0);
+            if (memberUserModel.SmallShopId > 0)
+            {
+                memberUserModel.Remark += "原店铺ID:" + memberUserModel.SmallShopId;
+            }
+            bool flag = smallShopsModule.SetSmallShopsAudit(ssmodel, Type, memberUserModel);
             if (flag)
             {
                 return ApiResult.Success();
@@ -263,7 +269,8 @@ namespace Mall.WebApi.Controllers.User
             var parms = JObject.Parse(re.msg.ToString());
             int RemitId = parms.GetInt("RemitId", 0);
             int ErpEmpId = parms.GetInt("ErpEmpId", 0);//erp用户id
-            if (ErpEmpId <= 0) {
+            if (ErpEmpId <= 0)
+            {
                 ErpEmpId = re.ERPEmpId;
             }
             int Type = parms.GetInt("Type", 0);//1审核通过  2打款  3驳回 
@@ -334,7 +341,8 @@ namespace Mall.WebApi.Controllers.User
                         return ApiResult.Success();
                     }
                 }
-                else if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.YETX) { 
+                else if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.YETX)
+                {
                     //余额提现
                 }
                 else

Mall.WebApi/Controllers/User/UserController.cs

@@ -89,9 +89,10 @@ namespace Mall.WebApi.Controllers.User
                 SourceName = x.Source.GetEnumName(),
                 x.TenantId,
                 x.PostId,
-                PostName=(x?.PostId??0)==1?"领队导游":"",
+                PostName = (x?.PostId ?? 0) == 1 ? "领队导游" : "",
+                UserPageTypeStr = x.UserPageType.GetEnumName(),
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
-            });
+            }); ;
             return ApiResult.Success("", pagelist);
         }