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

Mall.Model/Extend/TradePavilion/RB_Custom_Form_Extend.cs

@@ -141,6 +141,11 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public int FileCount { get; set; }
 
+        /// <summary>
+        /// 上传文件类型
+        /// </summary>
+        public string FileType { get; set; }
+
         /// <summary>
         /// 上传文件大小M
         /// </summary>

Mall.Module.TradePavilion/CustomFormModule.cs

@@ -205,6 +205,15 @@ namespace Mall.Module.TradePavilion
                                     }
                                     dataItem.CompData = videoItem;
                                     break;
+                                    //通用上传组件
+                                case "CommonUploadComp":
+                                    UploadItem commonUpload = GetUploadItem(compData);
+                                    if (!isGetAnswer)
+                                    {
+                                        commonUpload.FileList = new List<string>();
+                                    }
+                                    dataItem.CompData = commonUpload;
+                                    break;
                             }
                             dataList.Add(dataItem);
                         }
@@ -251,7 +260,7 @@ namespace Mall.Module.TradePavilion
             };
             if (selectItem.IsMultiple)
             {
-                List<string> valueList = JsonHelper.DeserializeObject<List<string>>(dropdownObj.GetStringValue("OptionValue"));
+                List<int> valueList = Common.ConvertHelper.StringToList(dropdownObj.GetStringValue("OptionValue").Split(','));
                 if (valueList != null && valueList.Count > 0)
                 {
                     selectItem.OptionValue = string.Join(",", valueList);
@@ -290,6 +299,7 @@ namespace Mall.Module.TradePavilion
             {
                 Name = uploadObj.GetStringValue("Name"),
                 FileCount = uploadObj.GetInt("FileCount"),
+                FileType = uploadObj.GetStringValue("FileType"),
                 FileSizeLimit = uploadObj.GetInt("FileSizeLimit"),
                 Remark = uploadObj.GetStringValue("Remark"),
                 FileList = new List<string>(),

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -262,8 +262,8 @@ namespace Mall.WebApi.Controllers.MallBase
                                     {
                                         attr_group_name = smodel.Name,
                                         attr_group_id = smodel.Sort,
-                                        attr_id = svmodel.Id,
-                                        attr_name = svmodel.Name
+                                        attr_id = svmodel?.Id ?? 0,
+                                        attr_name = svmodel?.Name ?? ""
                                     });
                                 }
                                 decimal price_member = item.SellingPrice ?? 0;//未设会员价格的话  就为销售价格

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -621,7 +621,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var query = new RB_Commerce_Consult_Extend()
             {
                 LinkMan = parms.GetStringValue("LinkMan"),
-                ActivityId=parms.GetInt("ActivityId")
+                ActivityId = parms.GetInt("ActivityId")
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
@@ -676,7 +676,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     foreach (var sItem in item.SignUserList)
                     {
                         var excelColumns = new List<ExcelColumn>(30);
-                        if (index == 0 )
+                        if (index == 0)
                         {
                             excelColumns.Add(new ExcelColumn(value: item.UserName) { Rowspan = item.RowSpan });
                             excelColumns.Add(new ExcelColumn(value: item.CompanyStatusStr) { Rowspan = item.RowSpan });
@@ -2289,7 +2289,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public FileContentResult GetFirstShopListEnrollToExcel() {
+        public FileContentResult GetFirstShopListEnrollToExcel()
+        {
 
             string ExcelName = "榜单报名" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
             List<ExcelDataSource> slist = new List<ExcelDataSource>();
@@ -2552,7 +2553,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
 
         /// <summary>
-        /// 报名列表word导出
+        /// 报名列表批量导出
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -2578,6 +2579,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
         }
 
+
+        /// <summary>
+        /// 删除生成的zip文件
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult DelFirstShopEnrollZipExport()
+        {
+            var req = base.RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            string ListIds = parms.GetStringValue("Url");
+            if (string.IsNullOrWhiteSpace(ListIds))
+            {
+                return ApiResult.ParamIsNull("请传递文件路径");
+            }
+           bool result = firstShopListModule.DelFirstShopEnrollZipExport(ListIds);
+            return ApiResult.Success("");
+        }
+
         #endregion
 
         #region 心愿单列表

Mall.WebApi/Mall.WebApi.csproj.user

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
-    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
-    <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
-    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
-    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
-    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
-    <WebStackScaffolding_LayoutPageFile />
-    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
-    <ShowAllFiles>false</ShowAllFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file