提交代码

Mall.Model/Entity/TradePavilion/RB_CarrierApplyFor.cs

@@ -221,15 +221,15 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public string StartingInfo { get; set; }
 
-        /// <summary>
-        /// 首秀政策
-        /// </summary>
-        public string FirstShow { get; set; }
-
-        /// <summary>
-        /// 首展政策
-        /// </summary>
-        public string FirstExhibition { get; set; }
+        ///// <summary>
+        ///// 首秀政策
+        ///// </summary>
+        //public string FirstShow { get; set; }
+
+        ///// <summary>
+        ///// 首展政策
+        ///// </summary>
+        //public string FirstExhibition { get; set; }
 
     }
 }

Mall.Module.TradePavilion/CarrierModule.cs

@@ -336,9 +336,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_CarrierApplyFor_Extend.BuiltUpArea),model.BuiltUpArea },
                     {nameof(RB_CarrierApplyFor_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
                     {nameof(RB_CarrierApplyFor_Extend.FirstShopNum),model.FirstShopNum },
-                    {nameof(RB_CarrierApplyFor_Extend.StartingInfo),model.StartingInfo },
-                    {nameof(RB_CarrierApplyFor_Extend.FirstShow),model.FirstShow },
-                    {nameof(RB_CarrierApplyFor_Extend.FirstExhibition),model.FirstExhibition },
+                    {nameof(RB_CarrierApplyFor_Extend.StartingInfo),model.StartingInfo }
                 };
                 flag = carrierApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_CarrierApplyFor_Extend.ID), model.ID));
                 if (flag)

Mall.Module.TradePavilion/CompanyModule.cs

@@ -617,7 +617,7 @@ namespace Mall.Module.TradePavilion
                                     #endregion
                                     #region 修改载体
                                     int FirstStoreTest = 0;
-                                    if (!string.IsNullOrWhiteSpace(CarrierModel.FirstShow) && !string.IsNullOrWhiteSpace(CarrierModel.Discount))
+                                    if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo) && !string.IsNullOrWhiteSpace(CarrierModel.Discount))
                                     {
                                         FirstStoreTest = 1;
                                     }

Mall.Repository/TradePavilion/RB_PrizeRepository.cs

@@ -25,7 +25,7 @@ namespace Mall.Repository.TradePavilion
         public List<RB_Prize_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Prize_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,(SELECT COUNT(*) from rb_brand where `Status`=0 and FIND_IN_SET(a.Id,SourceIds)) FROM rb_prize as a  WHERE `Status`=0 ");
+            builder.Append($" SELECT a.*,(SELECT COUNT(*) from rb_brand where `Status`=0 and FIND_IN_SET(a.Id,SourceIds)) as TotalCount FROM rb_prize as a  WHERE `Status`=0 ");
             if (query != null)
             {
 

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1024,6 +1024,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 根据活动ids获取活动列表
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult GetActivityList()
         {
             var userInfo = AppletUserInfo;
@@ -1102,6 +1103,31 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success("报名成功") : ApiResult.Failed("出错了，请联系管理员");
 
         }
+
+
+
+
+        /// <summary>
+        /// 根据活动ids获取活动列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCommerceConsult()
+        {
+            var userInfo = AppletUserInfo;
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Commerce_Consult_Extend()
+            {
+                ActivityId = jObj.GetInt("ActivityId"),
+                MallBaseId = userInfo.MallBaseId,
+                TenantId = userInfo.TenantId ,
+                UserId=userInfo.UserId
+            };
+            var list = consultModule.GetCommerceConsultListModule(extModel);
+            return ApiResult.Success("", list);
+        }
+
+
         #endregion
 
         /// <summary>
@@ -1271,7 +1297,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 x.AuditState,
                 x.AuditRemark,
                 AuditDate = x.AuditDate.HasValue ? x.AuditDate.Value.ToString("yyyy-MM-dd HH:mm") : "",
-                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm")
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                x.ExistBrandId,
             });
             return ApiResult.Success("", pagelist);
         }
@@ -1293,6 +1320,31 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var model = authenticationModule.GetAuthenticationInfo(AuthenticationId);
             if (model == null) { return ApiResult.Failed("认证不存在"); }
             if (userInfo.UserId != model.CreateBy) { return ApiResult.Failed("无法查看"); }
+
+            //获取品牌名称
+            string brandName = "";
+            if (model.ExistBrandId > 0)
+            {
+                var query = new RB_Brand_Extend()
+                {
+                    ID = model.ExistBrandId,
+
+                };
+                query.MallBaseId = userInfo.MallBaseId;
+                query.TenantId = userInfo.TenantId;
+                query.RanQi = -1;
+                query.KongTiao = -1;
+                query.XinFeng = -1;
+                query.Plumbing = -1;
+                query.Caliber = -1;
+                query.PaiYan = -1;
+                query.Sewage = -1;
+                var extModel = carrierModule.GetBrand(query);
+                if (extModel != null && extModel.ID > 0)
+                {
+                    brandName = extModel.BrandName;
+                }
+            }
             return ApiResult.Success("", new
             {
                 model.Id,
@@ -1319,7 +1371,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 model.AuditState,
                 model.AuditRemark,
                 AuditDate = model.AuditDate.HasValue ? model.AuditDate.Value.ToString("yyyy-MM-dd HH:mm") : "",
-                CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm")
+                CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                model.ExistBrandId,
+                BrandName = brandName
             });
         }
 

Mall.WebApi/Mall.WebApi.csproj.user

@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <NameOfLastUsedPublishProfile>E:\Work\Git_Project\Mall_Api\Mall.WebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file