暂存

Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -112,7 +112,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
                 curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
                 curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
-                curData.Add("MaxDivi", subdata["MaxDivi"].ToString()); //分账金额
+                curData.Add("MaxDivi", ConsumerProfitService.Sum(" and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
                 if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
                 curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体)

Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -40,7 +40,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string CertMerchantName = data["CertMerchantName"].ToString(); //商户名称
             string ServicePhone = data["ServicePhone"].ToString(); //客服电话
             string MakerCode = data["MakerCode"].ToString(); //所属创客编号
-            string Status = data["Status"].ToString(); //商户状态(0 审核中 1 已通过 -1 审核失败 20 微信待签约 21 微信已签约 10 支付宝待签约 11 支付宝已签约)
+            string WeChatStatus = data["WeChatStatus"].ToString(); //微信状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
+            string AliPayStatus = data["AliPayStatus"].ToString(); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
@@ -65,12 +66,13 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
                 condition += " and Id in (" + Ids + ")";
             }
-            if (!string.IsNullOrEmpty(data["Status"].ToString()))
+            if (!string.IsNullOrEmpty(data["WeChatStatus"].ToString()))
             {
-                if (Status == "0") condition += " and Status=0 and QueryCount=0"; //待审核
-                if (Status == "-1") condition += " and (Status=-1 or QueryCount=-1)"; //审核失败
-                if (Status == "1") condition += " and (Status=1 or QueryCount=1)"; //待签约
-                if (Status == "2") condition += " and Status=2 and QueryCount=2"; //已通过
+                condition += " and Status=" + WeChatStatus + "";
+            }
+            if (!string.IsNullOrEmpty(data["AliPayStatus"].ToString()))
+            {
+                condition += " and QueryCount=" + AliPayStatus + "";
             }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -98,20 +100,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
                 var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
-                curData.Add("RealName", userInfo.RealName); //所属创客姓名
-                //商户状态
-                var MerStatus = 0;
-                if (status == 0 && queryCount == 0) MerStatus = 0; //待审核
-                if (status == -1 || queryCount == -1) MerStatus = -1; //审核失败
-                if (status == 1 || queryCount == 1) MerStatus = 1; //待签约
-                if (status == 2 && queryCount == 2) MerStatus = 1; //已通过
-                curData.Add("Status", MerStatus); //商户状态
-                //审核平台
-                var AuditInfo = 1;
-                if (status == -1 && queryCount >= 1) AuditInfo = 2;
-                if (status >= 1 && queryCount == -1) AuditInfo = 1;
-                curData.Add("AuditInfo", AuditInfo); //审核平台(1 支付宝 2 微信)
-
+                curData.Add("WeChatStatus", status); //微信状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
+                curData.Add("AliPayStatus", queryCount); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数
@@ -135,18 +125,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            query = MerchantAddInfoService.Query(int.Parse(MerchantId));
-            var info = "";
-            if (query.Status == -1)
-            {
-                info += "微信：" + query.WeChatRemark + "\n";
-            }
-            if (query.QueryCount == -1)
-            {
-                info += "支付宝：" + query.AlipayRemark + "\n";
-            }
-            Obj.Add("Info", info); //失败原因
+            var query = MerchantAddInfoService.Query(int.Parse(MerchantId));
+            Obj.Add("HdReason", query.WeChatRemark); //好哒原因
+            Obj.Add("WeChatReason", query.WeChatRemark); //微信原因
+            Obj.Add("AlipayReason", query.AlipayRemark); //支付宝原因
 
             return Obj;
         }
@@ -218,7 +200,6 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string MerchantName = data["MerchantName"].ToString(); //商户名称
             string Mobile = data["Mobile"].ToString(); //手机号码
             string MakerCode = data["MakerCode"].ToString(); //所属创客
-            string MatchNo = data["MatchNo"].ToString(); //商户号
             string AliPID = data["AliPID"].ToString(); //支付宝PID
             string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体)
@@ -264,20 +245,23 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 //商户Id
                 var MerchantId = int.Parse(subdata["Id"].ToString());
+                var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MerchantId", subdata["Id"].ToString()); //商户Id
                 curData.Add("MerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("Mobile", subdata["MobilePhone"].ToString()); //手机号码
-                curData.Add("MakerCode", UsersService.Query(MerchantInfoService.Query(MerchantId).UserId).MakerCode); //所属创客
+                curData.Add("MakerCode", userInfo.MakerCode); //所属创客
+                curData.Add("RealName", userInfo.RealName); //所属创客姓名
                 var subjectType = 0;
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
                 curData.Add("AliPID", subdata["AlipayPid"].ToString()); //支付宝PID
+                curData.Add("AliPayToken", subdata["AlipayAuthToken"].ToString()); //支付宝token
                 curData.Add("WeChatNo", subdata["SubMchid"].ToString()); //微信商户号
                 curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
-                curData.Add("MatchNo", subdata["MchtNo"].ToString()); //商户号
-                curData.Add("OrderCount", ConsumerOrdersService.Count(" and Status>0 and MerchantId=" + MerchantId + "")); //订单总数
-                curData.Add("InComeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + MerchantId + "", "MerchantActualAmount")); //实收总金额
-                curData.Add("TradeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + MerchantId + "", "PayMoney")); //营业总金额
+                var amountInfo = MerchantAmountSummayService.Sum("TradeCount,TotalActual,TradeAmount", " and MerchantId=" + MerchantId + "");
+                curData.Add("OrderCount", decimal.Parse(amountInfo["TradeCount"].ToString())); //订单总数
+                curData.Add("InComeAmount", decimal.Parse(amountInfo["TotalActual"].ToString()).ToString("f2")); //实收总金额
+                curData.Add("TradeAmount", decimal.Parse(amountInfo["TradeAmount"].ToString()).ToString("f2")); //营业总金额
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数
@@ -300,22 +284,27 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             string AliPPID = data["AliPPID"].ToString(); //支付宝PID
+            string AliPayToken = data["AliPayToken"].ToString(); //支付宝token
             string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             var query = MerchantAddInfoService.Query(int.Parse(MerchantId));
             Dictionary<string, object> fields = new Dictionary<string, object>();
             if (query.Id > 0)
             {
-                if (!string.IsNullOrEmpty(query.AlipayPid))
+                if (string.IsNullOrEmpty(query.AlipayPid))
                 {
                     fields.Add("AlipayPid", AliPPID); //支付宝PID
                 }
-                if (!string.IsNullOrEmpty(query.SubMchid))
+                if (!string.IsNullOrEmpty(AliPayToken))
+                {
+                    fields.Add("AlipayAuthToken", AliPayToken); //支付宝token
+                }
+                if (string.IsNullOrEmpty(query.SubMchid))
                 {
                     fields.Add("SubMchid", WeChatNo); //微信商户号
                 }
             }
-            AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId));
+            AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId), false);
 
             return new AppResultJson() { Status = "1", Info = "添加成功", Data = Obj };
         }

Areas/Api/Controllers/v1/Main1/MerchantDepositOrderController.cs

@@ -50,11 +50,13 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             }
             if (!string.IsNullOrEmpty(AliPID))
             {
-                condition += " and AlipayPid='" + AliPID + "'";
+                var query = MerchantAddInfoService.Query(" and AlipayPid='" + AliPID + "'");
+                condition += " and MerchantId='" + query.Id + "'";
             }
             if (!string.IsNullOrEmpty(WeChatNo))
             {
-                condition += " and SubMchid='" + WeChatNo + "'";
+                var query = MerchantAddInfoService.Query(" and SubMchid='" + WeChatNo + "'");
+                condition += " and MerchantId='" + query.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["UpdateDate"].ToString()))
             {

Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -113,7 +113,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
                 curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
                 curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
-                curData.Add("MaxDivi", subdata["MaxDivi"].ToString()); //分账金额
+                curData.Add("MaxDivi", ConsumerProfitService.Sum(" and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
                 if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
                 if (query.SubjectType == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
@@ -126,7 +126,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         #endregion
 
 
-         #region 交易查询-银联订单发起分账
+        #region 交易查询-银联订单发起分账
         [Authorize]
         public JsonResult UnionPayQueryDivideAccounts(string value)
         {

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -40,7 +40,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string CertMerchantName = data["CertMerchantName"].ToString(); //商户名称
             string ServicePhone = data["ServicePhone"].ToString(); //客服电话
             string MakerCode = data["MakerCode"].ToString(); //所属创客编号
-            string Status = data["Status"].ToString(); //商户状态(0 审核中 1 已通过 -1 审核失败 20 微信待签约 21 微信已签约 10 支付宝待签约 11 支付宝已签约)
+            string HDStatus = data["HDStatus"].ToString(); //好哒状态(-1 审核失败 0 待审核 3 已通过)
+            string WeChatStatus = data["WeChatStatus"].ToString(); //微信状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
+            string AliPayStatus = data["AliPayStatus"].ToString(); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
@@ -66,12 +68,25 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
                 condition += " and Id in (" + Ids + ")";
             }
-            if (!string.IsNullOrEmpty(data["Status"].ToString()))
+            if (!string.IsNullOrEmpty(data["HDStatus"].ToString()))
             {
-                if (Status == "0") condition += " and Status=0 and QueryCount=0"; //待审核
-                if (Status == "-1") condition += " and (Status=-1 or QueryCount=-1)"; //审核失败
-                if (Status == "1") condition += " and (Status=1 or QueryCount=1)"; //待签约
-                if (Status == "2") condition += " and Status=2 and QueryCount=2"; //已通过
+
+                if (int.Parse(HDStatus) == 3)
+                {
+                    condition += " and HdStatus in(1,2,3)";
+                }
+                else
+                {
+                    condition += " and Status=" + HDStatus + "";
+                }
+            }
+            if (!string.IsNullOrEmpty(data["WeChatStatus"].ToString()))
+            {
+                condition += " and Status=" + WeChatStatus + "";
+            }
+            if (!string.IsNullOrEmpty(data["AliPayStatus"].ToString()))
+            {
+                condition += " and QueryCount=" + AliPayStatus + "";
             }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -81,8 +96,13 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                var hdStatus = int.Parse(subdata["HdStatus"].ToString());
                 var status = int.Parse(subdata["Status"].ToString());
                 var queryCount = int.Parse(subdata["QueryCount"].ToString());
+                if (hdStatus != 3)
+                {
+                    hdStatus = status;
+                }
 
                 //商户Id
                 var MerchantId = int.Parse(subdata["Id"].ToString());
@@ -101,21 +121,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
-                //商户状态
-                var MerStatus = 0;
-                if (status == 0 && queryCount == 0) MerStatus = 0; //待审核
-                if (status == -1 || queryCount == -1) MerStatus = -1; //审核失败
-                if (status == 1 || queryCount == 1) MerStatus = 1; //待签约
-                if (status == 2 && queryCount == 2) MerStatus = 1; //已通过
-                curData.Add("Status", MerStatus); //商户状态
-                //审核平台
-                var AuditInfo = 3;
-                if (status == 0 && queryCount == 0) AuditInfo = 3;
-                if (status >= 1 && queryCount == -1) AuditInfo = 1;
-                if (status == -1 && queryCount >= 1) AuditInfo = 2;
-                if (status == 2 && queryCount == 2) AuditInfo = 3;
-                curData.Add("AuditInfo", AuditInfo); //审核平台(1 支付宝 2 微信 3 好哒)
-
+                curData.Add("HDStatus", hdStatus); //好哒状态(-1 审核失败 0 待审核 3 已通过)
+                curData.Add("WeChatStatus", status); //微信状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
+                curData.Add("AliPayStatus", queryCount); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数
@@ -139,22 +147,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            query = MerchantAddInfoService.Query(int.Parse(MerchantId));
-            var info = "";
-            if (query.Status == -1 && string.IsNullOrEmpty(query.MchtNo))
-            {
-                info += "好哒：" + query.WeChatRemark + "\n";
-            }
-            if (query.Status == -1 && !string.IsNullOrEmpty(query.MchtNo))
-            {
-                info += "微信：" + query.WeChatRemark + "\n";
-            }
-            if (query.QueryCount == -1)
-            {
-                info += query.AlipayRemark + "\n";
-            }
-            Obj.Add("Info", info); //失败原因
+            var query = MerchantAddInfoService.Query(int.Parse(MerchantId));
+            Obj.Add("HdReason", query.WeChatRemark); //好哒原因
+            Obj.Add("WeChatReason", query.WeChatRemark); //微信原因
+            Obj.Add("AlipayReason", query.AlipayRemark); //支付宝原因
 
             return Obj;
         }
@@ -267,19 +263,22 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 //商户Id
                 var MerchantId = int.Parse(subdata["Id"].ToString());
+                var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MerchantId", subdata["Id"].ToString()); //商户Id
                 curData.Add("MerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("Mobile", subdata["MobilePhone"].ToString()); //手机号码
-                curData.Add("MakerCode", UsersService.Query(MerchantInfoService.Query(MerchantId).UserId).MakerCode); //所属创客
+                curData.Add("MakerCode", userInfo.MakerCode); //所属创客
+                curData.Add("RealName", userInfo.RealName); //所属创客姓名
                 var subjectType = 0;
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
                 curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
                 curData.Add("MatchNo", subdata["MchtNo"].ToString()); //商户号
-                curData.Add("OrderCount", ConsumerOrdersService.Count(" and Status>0 and MerchantId=" + MerchantId + "")); //订单总数
-                curData.Add("TradeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + MerchantId + "", "PayMoney")); //营业总金额
-                curData.Add("InComeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + MerchantId + "", "MerchantActualAmount")); //实收总金额
+                var amountInfo = MerchantAmountSummayService.Sum("TradeCount,TotalActual,TradeAmount", " and MerchantId=" + MerchantId + "");
+                curData.Add("OrderCount", decimal.Parse(amountInfo["TradeCount"].ToString())); //订单总数
+                curData.Add("InComeAmount", decimal.Parse(amountInfo["TotalActual"].ToString()).ToString("f2")); //实收总金额
+                curData.Add("TradeAmount", decimal.Parse(amountInfo["TradeAmount"].ToString()).ToString("f2")); //营业总金额
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数

Service/Main1/ConsumerProfitService.cs

@@ -14,7 +14,7 @@ namespace MySystem.Service.Main1
 {
     public class ConsumerProfitService
     {
-        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr1"].ToString();
 
         /// <summary>
         /// 查询列表

Service/Main1/MerchantAmountSummayService.cs

@@ -0,0 +1,259 @@
+/*
+ * 商户业绩统计
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main1;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main1
+{
+    public class MerchantAmountSummayService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr1"].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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("MerchantAmountSummay", 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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("MerchantAmountSummay", 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 MerchantAmountSummay Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAmountSummay editData = db.MerchantAmountSummay.FirstOrDefault(m => m.Id == Id) ?? new MerchantAmountSummay();
+            db.Dispose();
+            return editData;
+        }
+        public static MerchantAmountSummay Query(string condition, string fields = "*")
+        {
+            var merchantAmountSummay = new DbService(AppConfig.Base.main1Tables, _conn).Query(fields, "MerchantAmountSummay", condition);
+            if (merchantAmountSummay.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAmountSummay>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAmountSummay));
+            }
+            return new MerchantAmountSummay();
+        }
+
+        // public static decimal Sum(string condition, string field)
+        // {
+        //     var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Sum(" + field + ") " + field, "MerchantAmountSummay", condition);
+        //     decimal amount = 0;
+        //     if (dt.Count > 0)
+        //     {
+        //         amount = decimal.Parse(dt[field].ToString());
+        //     }
+        //     return amount;
+        // }
+
+        public static Dictionary<string, string> Sum(string field, string condition)
+        {
+            Dictionary<string, string> result = new Dictionary<string, string>();
+            string sumString = "";
+            string[] fieldlist = field.Split(',');
+            foreach (string f in fieldlist)
+            {
+                sumString += "sum(" + f + ") " + f + ",";
+            }
+            sumString = sumString.TrimEnd(',');
+            DataTable dt = CustomerSqlConn.dtable("select " + sumString + " from MerchantAmountSummay where 1=1" + condition, _conn);
+            if (dt.Rows.Count > 0)
+            {
+                foreach (string f in fieldlist)
+                {
+                    result.Add(f, function.CheckNum(dt.Rows[0][f].ToString()));
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Count(" + field + ") " + field, "MerchantAmountSummay", 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.MerchantAmountSummay.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.main1Tables, _conn).Add("MerchantAmountSummay", 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)
+            {
+                if (string.IsNullOrEmpty(fields["NickName"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写昵称" };
+                }
+
+            }
+            new DbService(AppConfig.Base.main1Tables, _conn).Edit("MerchantAmountSummay", 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.main1Tables, _conn).Edit("MerchantAmountSummay", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.main1Tables, _conn).Delete("MerchantAmountSummay", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.main1Tables, _conn).Sort("MerchantAmountSummay", 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.MerchantAmountSummay.Add(new MerchantAmountSummay()
+                {
+                    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/Main2/ConsumerProfitService.cs

@@ -14,7 +14,7 @@ namespace MySystem.Service.Main2
 {
     public class ConsumerProfitService
     {
-        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
 
         /// <summary>
         /// 查询列表

Service/Main2/MerchantAmountSummayService.cs

@@ -0,0 +1,259 @@
+/*
+ * 商户业绩统计
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main2;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main2
+{
+    public class MerchantAmountSummayService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr2"].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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main2Tables, _conn).IndexData("MerchantAmountSummay", 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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main2Tables, _conn).IndexData("MerchantAmountSummay", 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 MerchantAmountSummay Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAmountSummay editData = db.MerchantAmountSummay.FirstOrDefault(m => m.Id == Id) ?? new MerchantAmountSummay();
+            db.Dispose();
+            return editData;
+        }
+        public static MerchantAmountSummay Query(string condition, string fields = "*")
+        {
+            var merchantAmountSummay = new DbService(AppConfig.Base.main2Tables, _conn).Query(fields, "MerchantAmountSummay", condition);
+            if (merchantAmountSummay.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAmountSummay>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAmountSummay));
+            }
+            return new MerchantAmountSummay();
+        }
+
+        // public static decimal Sum(string condition, string field)
+        // {
+        //     var dt = new DbService(AppConfig.Base.main2Tables, _conn).Query("Sum(" + field + ") " + field, "MerchantAmountSummay", condition);
+        //     decimal amount = 0;
+        //     if (dt.Count > 0)
+        //     {
+        //         amount = decimal.Parse(dt[field].ToString());
+        //     }
+        //     return amount;
+        // }
+
+        public static Dictionary<string, string> Sum(string field, string condition)
+        {
+            Dictionary<string, string> result = new Dictionary<string, string>();
+            string sumString = "";
+            string[] fieldlist = field.Split(',');
+            foreach (string f in fieldlist)
+            {
+                sumString += "sum(" + f + ") " + f + ",";
+            }
+            sumString = sumString.TrimEnd(',');
+            DataTable dt = CustomerSqlConn.dtable("select " + sumString + " from MerchantAmountSummay where 1=1" + condition, _conn);
+            if (dt.Rows.Count > 0)
+            {
+                foreach (string f in fieldlist)
+                {
+                    result.Add(f, function.CheckNum(dt.Rows[0][f].ToString()));
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.main2Tables, _conn).Query("Count(" + field + ") " + field, "MerchantAmountSummay", 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.MerchantAmountSummay.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.main2Tables, _conn).Add("MerchantAmountSummay", 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)
+            {
+                if (string.IsNullOrEmpty(fields["NickName"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写昵称" };
+                }
+
+            }
+            new DbService(AppConfig.Base.main2Tables, _conn).Edit("MerchantAmountSummay", 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.main2Tables, _conn).Edit("MerchantAmountSummay", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.main2Tables, _conn).Delete("MerchantAmountSummay", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.main2Tables, _conn).Sort("MerchantAmountSummay", 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.MerchantAmountSummay.Add(new MerchantAmountSummay()
+                {
+                    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/Base/BaseClass.cs

@@ -6,43 +6,6 @@ namespace MySystem
     /// </summary>
     public class BaseClass
     {
-
-        #region 商户主状态
-        /// <summary>
-        /// 商户主状态
-        /// </summary>
-        /// <param name="AlipayStatus">支付宝状态</param>
-        /// <param name="WeChatStatus">微信状态</param>
-        /// <returns></returns>
-        public static string GetMainStatusName(int AlipayStatus, int WeChatStatus)
-        {
-            if (AlipayStatus == -1)
-            {
-                if (WeChatStatus == -1) return "审核未通过";
-                if (WeChatStatus == 0 || WeChatStatus == 1 || WeChatStatus == 2) return "部分未通过";
-            }
-            if (AlipayStatus == 0)
-            {
-                if (WeChatStatus == -1) return "部分未通过";
-                if (WeChatStatus == 0) return "待审核";
-                if (WeChatStatus == 1) return "部分待签约";
-                if (WeChatStatus == 2) return "部分已通过";
-            }
-            if (AlipayStatus == 1)
-            {
-                if (WeChatStatus == -1) return "部分未通过";
-                if (WeChatStatus == 0 || WeChatStatus == 2) return "部分待签约";
-                if (WeChatStatus == 1) return "待签约";
-            }
-            if (AlipayStatus == 2)
-            {
-                if (WeChatStatus == -1) return "部分未通过";
-                if (WeChatStatus == 0) return "部分已通过";
-                if (WeChatStatus == 1) return "部分待签约";
-                if (WeChatStatus == 2) return "已通过";
-            }
-            return "";
-        }
-        #endregion
+        
     }
 }