调整创客-首页-新增商户

新增创客-首页-进件查询

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using LitJson;
+using Library;
+using MySystem.Service.Main;
+using MySystem.Models.Main;
+using System.Text;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class MerchantInfoController : BaseController
+    {
+        public MerchantInfoController(IHttpContextAccessor accessor) : base(accessor)
+        {
+        }
+
+
+
+
+
+        #region 创客-首页-进件查询
+        // [Authorize]
+        public JsonResult MerchantByStatus(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = MerchantByStatusDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        public List<Dictionary<string, object>> MerchantByStatusDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string SearchKey = data["SearchKey"].ToString();
+            int Status = int.Parse(function.CheckInt(data["Status"].ToString()));
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            StringBuilder condition = new StringBuilder();
+            condition.Condition("UserId", UserId);
+            if (Status > 0)
+            {
+                if (Status == 1) Status = 0;
+                if (Status == 2) Status = -1;
+                if (Status == 3) Status = 1;
+                if (Status == 4) Status = 2;
+                condition.Condition("Status", Status);
+            }
+            if(!string.IsNullOrEmpty(SearchKey))
+            {
+                condition.ConditionLike("Name", SearchKey);
+            }
+            List<Dictionary<string, object>> list = MerchantInfoService.List(new List<RelationData>(), condition.ToString(), PageNum, PageSize);
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            foreach (Dictionary<string, object> subdata in list)
+            {
+                MerchantAddInfo AddInfo = MerchantAddInfoService.Query(int.Parse(subdata["Id"].ToString()));
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Name", subdata["Name"]); //名称
+                curData.Add("Id", subdata["Id"]); //Id
+                curData.Add("CreateDate", subdata["CreateDate"]); //CreateDate
+                curData.Add("Status", subdata["Status"]); //Status
+                curData.Add("SubjectType", AddInfo.SubjectType); //主体类型
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+
+        #region 创客-首页-进件查询-详情
+        // [Authorize]
+        public JsonResult MerchantDetailByStatus(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Obj = MerchantDetailByStatusDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        public Dictionary<string, object> MerchantDetailByStatusDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
+            MerchantInfo query = MerchantInfoService.Query(Id);
+            MerchantAddInfo addInfo = MerchantAddInfoService.Query(Id);
+            Obj.Add("Name", query.Name); //名称
+            Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交时间
+
+            Obj.Add("Status", addInfo.Status);
+            Obj.Add("DoTime", addInfo.UpdateDate == null ? "" : addInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+            Obj.Add("Season", addInfo.WeChatRemark);
+            Obj.Add("SignUrl", addInfo.WeChatSignUrl);
+
+            Obj.Add("SubjectType", addInfo.SubjectType);
+            return Obj;
+        }
+        #endregion
+
+
+
+
+        #region 检查签名是否合法，合法返回1，不合法返回提示信息
+
+        /// <summary>
+        /// 检查签名是否合法，合法返回1，不合法返回提示信息
+        /// </summary>
+        /// <param name="value">请求的参数(json字符串)</param>
+        /// <param name="signField">要签名的字段</param>
+        /// <returns></returns>
+        private string CheckSign(string value, string[] signField)
+        {
+            JsonData json = JsonMapper.ToObject(value);
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            for (int i = 0; i < signField.Length; i++)
+            {
+                dic.Add(signField[i], json[signField[i]].ToString());
+            }
+            string sign = json["sign"].ToString(); //客户端签名字符串
+            return new Sign().sign(dic, sign);
+        }
+
+        #endregion
+
+    }
+}

Controllers/HomeController.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Library;
 using LitJson;
+using System.Text;
 
 namespace MySystem.Controllers
 {

Service/Main/BusinessScopeService.cs

@@ -0,0 +1,214 @@
+/*
+ * 商家收款二维码
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main
+{
+    public class BusinessScopeService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="relationData">关联表</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="count">总数（输出）</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, out int count, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("MachineId"); //设备
+            fields.Add("SnNo"); //Sn编号
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("BusinessScope", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            count = int.Parse(obj["count"].ToString());
+            return diclist;
+        }
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("MachineId"); //设备
+            fields.Add("SnNo"); //Sn编号
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("BusinessScope", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static BusinessScope Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            BusinessScope editData = db.BusinessScope.FirstOrDefault(m => m.Id == Id) ?? new BusinessScope();
+            db.Dispose();
+            return editData;
+        }
+        public static BusinessScope Query(string condition, string fields = "*")
+        {
+            var BusinessScope = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "BusinessScope", condition);
+            if (BusinessScope.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<BusinessScope>(Newtonsoft.Json.JsonConvert.SerializeObject(BusinessScope));
+            }
+            return new BusinessScope();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "BusinessScope", condition);
+            decimal amount = 0;
+            if (dt.Count > 0)
+            {
+                amount = decimal.Parse(dt[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Count(" + field + ") " + field, "BusinessScope", condition);
+            int result = 0;
+            if (dt.Count > 0)
+            {
+                result = int.Parse(dt[field].ToString());
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            bool check = db.BusinessScope.Any(m => m.Id == Id);
+            db.Dispose();
+            return check;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if (check)
+            {
+
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("BusinessScope", fields, 0);
+            return new AppResultJson() { Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
+        {
+            if (check)
+            {
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("BusinessScope", fields, Id);
+            return new AppResultJson() { Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 逻辑删除
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Remove(int Id)
+        {
+            Dictionary<string, object> fields = new Dictionary<string, object>();
+            fields.Add("Status", -1);
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("BusinessScope", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("BusinessScope", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("BusinessScope", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public static void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+
+                db.BusinessScope.Add(new BusinessScope()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Service/Main/BusinessScopeTypeService.cs

@@ -0,0 +1,214 @@
+/*
+ * 商家收款二维码
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main
+{
+    public class BusinessScopeTypeService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="relationData">关联表</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="count">总数（输出）</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, out int count, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("MachineId"); //设备
+            fields.Add("SnNo"); //Sn编号
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("BusinessScopeType", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            count = int.Parse(obj["count"].ToString());
+            return diclist;
+        }
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("MachineId"); //设备
+            fields.Add("SnNo"); //Sn编号
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("BusinessScopeType", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static BusinessScopeType Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            BusinessScopeType editData = db.BusinessScopeType.FirstOrDefault(m => m.Id == Id) ?? new BusinessScopeType();
+            db.Dispose();
+            return editData;
+        }
+        public static BusinessScopeType Query(string condition, string fields = "*")
+        {
+            var BusinessScopeType = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "BusinessScopeType", condition);
+            if (BusinessScopeType.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<BusinessScopeType>(Newtonsoft.Json.JsonConvert.SerializeObject(BusinessScopeType));
+            }
+            return new BusinessScopeType();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "BusinessScopeType", condition);
+            decimal amount = 0;
+            if (dt.Count > 0)
+            {
+                amount = decimal.Parse(dt[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Count(" + field + ") " + field, "BusinessScopeType", condition);
+            int result = 0;
+            if (dt.Count > 0)
+            {
+                result = int.Parse(dt[field].ToString());
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            bool check = db.BusinessScopeType.Any(m => m.Id == Id);
+            db.Dispose();
+            return check;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if (check)
+            {
+
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("BusinessScopeType", fields, 0);
+            return new AppResultJson() { Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
+        {
+            if (check)
+            {
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("BusinessScopeType", fields, Id);
+            return new AppResultJson() { Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 逻辑删除
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Remove(int Id)
+        {
+            Dictionary<string, object> fields = new Dictionary<string, object>();
+            fields.Add("Status", -1);
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("BusinessScopeType", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("BusinessScopeType", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("BusinessScopeType", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public static void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+
+                db.BusinessScopeType.Add(new BusinessScopeType()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Util/Main/MerchantAddInfoUtil.cs

@@ -151,7 +151,15 @@ namespace MySystem
             }
             else
             {
-                info = MerchantAddInfoService.Edit(Fields, Id, false);
+                if (MerchantAddInfoService.Exist(Id))
+                {
+                    info = MerchantAddInfoService.Edit(Fields, Id, false);
+                }
+                else
+                {
+                    Fields.Add("Id", Id);
+                    info = MerchantAddInfoService.Add(Fields, false);
+                }
             }
             return info;
         }
@@ -165,8 +173,9 @@ namespace MySystem
         /// <param name="AccountTypes"></param>
         /// <param name="Settles"></param>
         /// <returns></returns>
-        public static Dictionary<string, object> MerchantAddInfoDetail(MerchantAddInfo query, Dictionary<string, string> Subjects, Dictionary<string, string> AccountTypes, List<SettleData> Settles)
+        public static Dictionary<string, object> MerchantAddInfoDetail(int Id)
         {
+            var query = MerchantAddInfoService.Query(Id);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             Obj.Add("ContactName", query.ContactName); //管理员姓名
             Obj.Add("ContactIdNumber", query.ContactIdNumber); //管理员身份证件号码
@@ -174,14 +183,7 @@ namespace MySystem
             Obj.Add("MobilePhone", query.MobilePhone); //联系手机
             Obj.Add("ContactEmail", query.ContactEmail); //联系邮箱
             Obj.Add("SubjectType", query.SubjectType); //主体类型
-            if (Subjects.ContainsKey(query.SubjectType))
-            {
-                Obj.Add("SubjectTypeName", Subjects[query.SubjectType]);
-            }
-            else
-            {
-                Obj.Add("SubjectTypeName", "");
-            }
+            Obj.Add("SubjectTypeName", GetDicValue(GetSubjects(), query.SubjectType));
             Obj.Add("LicenseCopy", query.LicenseCopy); //营业执照照片
             Obj.Add("LicenseNumber", query.LicenseNumber); //统一社会信用代码
             Obj.Add("LegalPerson", query.LegalPerson); //个体户经营者/法人姓名
@@ -210,7 +212,6 @@ namespace MySystem
             Obj.Add("UboInfoIdPeriodEnd", query.UboInfoIdPeriodEnd == null ? "" : query.UboInfoIdPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //证件有效期结束时间
             Obj.Add("MerchantShortname", query.MerchantShortname); //商户简称
             Obj.Add("ServicePhone", query.ServicePhone); //客服电话
-            Obj.Add("SalesScenesType", query.SalesScenesType); //经营场景类型
             Obj.Add("BizStoreName", query.BizStoreName); //门店名称
             Obj.Add("BizAddressCode", query.BizAddressCode); //门店省市编码
             Obj.Add("BizStoreAddress", query.BizStoreAddress); //门店地址
@@ -233,27 +234,11 @@ namespace MySystem
             Obj.Add("WeworkPics", query.WeworkPics); //企业微信页面截图
             Obj.Add("SettlementId", query.SettlementId + "_" + query.UpdateMan); //入驻结算规则ID
             Obj.Add("QualificationType", query.QualificationType); //所属行业
-            SettleData item = Settles.FirstOrDefault(m => m.value == query.QualificationType);
-            if (item != null)
-            {
-                Obj.Add("QualificationTypeName", item.ptext + "," + item.text);
-            }
-            else
-            {
-                Obj.Add("QualificationTypeName", "");
-            }
             Obj.Add("Qualifications", query.Qualifications); //特殊资质图片
             Obj.Add("ActivitiesId", query.ActivitiesId); //优惠费率活动ID
             Obj.Add("ActivitiesRate", query.ActivitiesRate); //优惠费率活动值
             Obj.Add("BankAccountType", query.BankAccountType); //账户类型
-            if (AccountTypes.ContainsKey(query.BankAccountType))
-            {
-                Obj.Add("BankAccountTypeName", AccountTypes[query.BankAccountType]);
-            }
-            else
-            {
-                Obj.Add("BankAccountTypeName", "");
-            }
+            Obj.Add("BankAccountTypeName", GetDicValue(GetAccountTypes(), query.BankAccountType));
             Obj.Add("AccountName", query.AccountName); //开户名称
             Obj.Add("AccountBank", query.AccountBank); //开户银行
             Obj.Add("BankAddressCode", query.BankAddressCode); //开户银行省市编码
@@ -277,8 +262,51 @@ namespace MySystem
             Obj.Add("CreateDate", query.CreateDate); //创建时间
             Obj.Add("AlipayAccount", query.CreateMan); //支付宝账号
 
+            Obj.Add("MchtNo", query.MchtNo); //好哒商户号
+            Obj.Add("BankCard", query.BankCard); //收款人银行卡照片
+            Obj.Add("PersonWithIdCard", query.PersonWithIdCard); //法人手持身份证正面
+            Obj.Add("IndustryLicense1", query.IndustryLicense1); //行业许可证
+            Obj.Add("Extra1", query.Extra1); //补充资料
+            Obj.Add("CheckstandImg", query.CheckstandImg); //收银台
+            Obj.Add("SalesScenesType", query.SalesScenesType); //经营场景类型
+            BusinessScope businessScope = BusinessScopeService.Query(int.Parse(function.CheckInt(query.SalesScenesType)));
+            BusinessScopeType businessScopeType = BusinessScopeTypeService.Query(businessScope.KindId);
+            Obj.Add("SalesScenesTypeName", businessScopeType.KindName + "," + businessScope.Name);
+            Obj.Add("OpenAccountLicenses", query.OpenAccountLicenses); //开户许可证
+            Obj.Add("ResserveMobile", query.ResserveMobile); //银行预留手机号
+            Obj.Add("ChannelKind", query.ChannelKind); // 商户类型
+
             return Obj;
         }
 
+        public static Dictionary<string, string> GetSubjects()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("SUBJECT_TYPE_INDIVIDUAL", "个体工商户");
+            dic.Add("SUBJECT_TYPE_ENTERPRISE", "企业公司");
+            dic.Add("SUBJECT_TYPE_SMALL", "小微商户");
+            // dic.Add("SUBJECT_TYPE_INSTITUTIONS", "党政、机关及事业单位");
+            // dic.Add("SUBJECT_TYPE_OTHERS", "其他组织");
+            return dic;
+        }
+
+        public static Dictionary<string, string> GetAccountTypes()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("BANK_ACCOUNT_TYPE_CORPORATE", "企业对公银行账号");
+            dic.Add("BANK_ACCOUNT_TYPE_PERSONAL", "法人个人银行卡");
+            return dic;
+        }
+
+        public static string GetDicValue(Dictionary<string, string> dic, string key)
+        {
+            key = function.CheckNull(key);
+            if(dic.ContainsKey(key))
+            {
+                return dic[key];
+            }
+            return "";
+        }
+
     }
 }

Util/StringExtension.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+
+namespace MySystem
+{
+    public static class StringBuilderExtension
+    {
+        public static void Condition(this StringBuilder input, string field, object val)
+        {
+            if(typeof(int) == val.GetType() || typeof(decimal) == val.GetType())
+            {
+                input.Append(" and " + field + "=" + val);
+            }
+            else
+            {
+                input.Append(" and " + field + "='" + val + "'");
+            }
+        }
+
+        public static void ConditionLike(this StringBuilder input, string field, object val)
+        {
+            input.Append(" and " + field + " like '%" + val + "%'");
+        }
+    }
+}