提交代码

Mall.CacheManager/User/UserReidsCache.cs

@@ -443,5 +443,53 @@ namespace Mall.CacheManager.User
                 return true;
             }
         }
+
+
+
+
+
+        /// <summary>
+        /// 设置首店下载缓存
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="Data"></param>
+        /// <param name="JwtExpirTime"></param>
+        public static void SetMallDownLoadInfo(string cacheKey, object Data, int JwtExpirTime)
+        {
+            try
+            {
+                TimeSpan ts = GetExpirTime(JwtExpirTime);
+                redis.StringSet(cacheKey, Data, ts);
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 获取首店下载
+        /// </summary>
+        /// <param name="Id">账号Id</param>
+        /// <param name="apiRequestFromEnum">请求来源</param>
+        /// <returns></returns>
+        public static Model.Extend.TradePavilion.DownLoad GetMallDownLoadInfo(object Id)
+        {
+            Model.Extend.TradePavilion.DownLoad downLoad = new Model.Extend.TradePavilion.DownLoad();
+            if (Id != null)
+            {
+                string cacheKey = Id.ToString();
+                try
+                {
+                    downLoad = redis.StringGet<Model.Extend.TradePavilion.DownLoad>(cacheKey);
+                }
+                catch (Exception ex)
+                {
+                    downLoad = new Model.Extend.TradePavilion.DownLoad();
+                    Common.Plugin.LogHelper.Write(ex, "GetMallDownLoadInfo");
+                }
+            }
+            return downLoad;
+        }
+
     }
 }

Mall.CacheManager/keyManager/UserModuleCacheKeyConfig.cs

@@ -65,5 +65,15 @@ namespace Mall.CacheKey
         {
             get { return "User_Send_Code_"; }
         }
+
+
+
+        /// <summary>
+        /// Mall_DownLoad_Info_(用户id)
+        /// </summary>
+        public static string Mall_DownLoad_Info_
+        {
+            get { return "Mall_DownLoad_Info_"; }
+        }
     }
 }

Mall.Common/Enum/Goods/OrderPaymentTypeEnum.cs

@@ -43,7 +43,7 @@ namespace Mall.Common.Enum.Goods
         /// 储值卡支付
         /// </summary>
         [EnumField("储值卡支付")]
-        PayCards = 6,
+        PayCards = 7,
 
         /// <summary>
         /// 点数支付

Mall.Model/Extend/TradePavilion/RB_FirstShop_ListEnroll_Extend.cs

@@ -68,4 +68,13 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public string ObjectIds { get; set; }
     }
+
+    /// <summary>
+    /// 下载实体
+    /// </summary>
+    public class DownLoad
+    {
+
+        public string Url { get; set; }
+    }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -746,6 +746,82 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
         }
 
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        [HttpPost]
+        public FileContentResult DownLoadConsultStaticNew()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            pageModel.pageSize = 100000;
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_Consult_Extend()
+            {
+                LinkMan = parms.GetStringValue("LinkMan"),
+                ActivityId = parms.GetInt("ActivityId")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out _, query);
+            string ExcelName = "活动用户导出" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            ExcelDataSource header = new ExcelDataSource()
+            {
+                ExcelRows = new List<ExcelColumn>(30)
+                {
+                   new ExcelColumn(value: "用户昵称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "认证状态") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "认证公司") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "认证信息") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "公司") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "性质") { CellWidth = 20, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "联系人") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "联系电话") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "职务") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                   new ExcelColumn(value: "地址") { CellWidth = 30, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                },
+            };
+            slist.Add(header);
+            try
+            {
+                #region 组装数据
+                foreach (var item in list)
+                {
+                    foreach (var sItem in item.SignUserList)
+                    {
+                        var excelColumns = new List<ExcelColumn>(30);
+                        excelColumns.Add(new ExcelColumn(value: item.UserName) );
+                        excelColumns.Add(new ExcelColumn(value: item.CompanyStatusStr) );
+                        excelColumns.Add(new ExcelColumn(value: item.CompanyName) );
+                        excelColumns.Add(new ExcelColumn(value: item.AuthName) );
+                        excelColumns.Add(new ExcelColumn(value: sItem.CompanyName));
+                        excelColumns.Add(new ExcelColumn(value: sItem.Nature));
+                        excelColumns.Add(new ExcelColumn(value: sItem.LinkMan));
+                        excelColumns.Add(new ExcelColumn(value: sItem.LinkTel));
+                        excelColumns.Add(new ExcelColumn(value: sItem.Post));
+                        excelColumns.Add(new ExcelColumn(value: sItem.CountryInfo));
+
+                        ExcelDataSource datarow = new ExcelDataSource()
+                        {
+                            ExcelRows = excelColumns
+                        };
+                        slist.Add(datarow);
+                    }
+                }
+                #endregion
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", ExcelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, string.Format("DownLoadConsultStatic_requestData: {0}", JsonHelper.Serialize(RequestParm)));
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", ExcelName);
+            }
+        }
+
+
         /// <summary>
         /// 根据编号获取商会活动报名实体
         /// </summary>
@@ -1424,7 +1500,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         public ApiResult GetSetCarrier()
         {
             RB_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Carrier_Extend>(RequestParm.msg.ToString());
-            
+
             if (string.IsNullOrWhiteSpace(query.CarrierName))
             {
                 return ApiResult.Failed("请输入载体名称");
@@ -1449,7 +1525,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.Failed("请输入可租赁面积");
             }
-            
+
             if (string.IsNullOrWhiteSpace(query.Logo))
             {
                 return ApiResult.Failed("请上传Logo");
@@ -2637,7 +2713,89 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 return ApiResult.Failed(errmsg);
             }
         }
+        /// <summary>
+        /// 报名列表批量导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetFirstShopEnrollZipExport_V3()
+        {
+            var req = base.RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            string ListIds = parms.GetStringValue("ListIds");
+            if (string.IsNullOrWhiteSpace(ListIds))
+            {
+                return ApiResult.ParamIsNull("请传递绑定ids");
+            }
+
+            string path = firstShopListModule.GetPackageFile(ListIds, req.MallBaseId, out string errmsg);
+            if (errmsg == "")
+            {
+                return ApiResult.Success("", path);
+            }
+            else
+            {
+                return ApiResult.Failed(errmsg);
+            }
+        }
+
+
+
+
+
+        /// <summary>
+        /// 报名列表批量导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetNewFirstShopEnrollZipExport()
+        {
+            var req = base.RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            string ListIds = parms.GetStringValue("ListIds");
+            if (string.IsNullOrWhiteSpace(ListIds))
+            {
+                return ApiResult.ParamIsNull("请传递绑定ids");
+            }
+
+            string path = firstShopListModule.GetFirstShopEnrollZipExport_V2(ListIds, req.MallBaseId, out string errmsg);
+            if (errmsg == "")
+            {
+                return ApiResult.Success("", path);
+            }
+            else
+            {
+                return ApiResult.Failed(errmsg);
+            }
+        }
+        /// <summary>
+        /// 报名列表批量导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetFirstShopEnrollResultUrl()
+        {
+            var req = base.RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            string UserFlag = parms.GetStringValue("UserFlag");
+            if (string.IsNullOrWhiteSpace(UserFlag))
+            {
+                return ApiResult.ParamIsNull("请传递绑定UserFlag");
+            }
 
+            string path = firstShopListModule.GetFirstShopEnrollResultUrl(UserFlag, out int errcode);
+            if (errcode == 1)
+            {
+                return ApiResult.Success("", path);
+            }
+            else
+            {
+                return ApiResult.Failed("下载请求不存在");
+            }
+        }
 
         /// <summary>
         /// 删除生成的zip文件