调整

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

@@ -48,7 +48,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string condition = "";
             if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
             {
-                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName=" + MerchantName + "");
+                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName='" + MerchantName + "'");
                 condition += " and MerchantId='" + merAddInfo.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
@@ -90,7 +90,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
                 if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
-                condition += " and SubjectType='" + SubjectType + "'";
+                var Ids = MerchantInfoUtil.QueryMerchantIdBySubjectType(SubjectType);
+                condition += " and MerchantId in (" + Ids + ")";
             }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -101,14 +102,19 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("Id", subdata["Id"].ToString()); //Id
-                curData.Add("MerchantName", subdata["MerchantName"].ToString()); //交易商户
+                var subjectType = 0;
+                curData.Add("MerchantName", MerchantAddInfoService.Query(int.Parse(subdata["MerchantId"].ToString())).CertMerchantName); //交易商户
                 curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
-                curData.Add("Status", subdata["Status"].ToString()); //交易状态(0 未支付 1 已支付)
+                var status = 0;
+                if (subdata["Status"].ToString() != "0") status = 1;
+                curData.Add("Status", status); //交易状态(0 未支付 1 已支付)
                 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("SubjectType", subdata["SubjectType"].ToString()); //主体类型(1 企业 2 个体)
+                if (data["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
+                if (data["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
+                curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体)
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数

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

@@ -247,8 +247,6 @@ 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 WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantAddInfo query = new MerchantAddInfo();
             Dictionary<string, object> fields = new Dictionary<string, object>();

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

@@ -35,7 +35,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
-            string MctNo = data["MctNo"].ToString(); //商户号
+            string AliPID = data["AliPID"].ToString(); //支付宝PID
+            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             string UpdateDate = data["UpdateDate"].ToString(); //激活时间
             string PayMode = data["PayMode"].ToString(); //支付方式(1 支付宝 2 微信)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));

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

@@ -40,7 +40,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
-            string condition = "";
+            string condition = " and IsAct=1 and ExamineStatus=1 and Months=10";
             if (!string.IsNullOrEmpty(MerchantName))
             {
                 condition += " and Name='" + MerchantName + "'";

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

@@ -48,7 +48,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string condition = "";
             if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
             {
-                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName=" + MerchantName + "");
+                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName='" + MerchantName + "'");
                 condition += " and MerchantId='" + merAddInfo.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
@@ -90,8 +90,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             {
                 if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
                 if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
-                if (data["SubjectType"].ToString() == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微
-                condition += " and SubjectType='" + SubjectType + "'";
+                var Ids = MerchantInfoUtil.QueryMerchantIdBySubjectType(SubjectType);
+                condition += " and MerchantId in (" + Ids + ")";
             }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -102,14 +102,21 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("Id", subdata["Id"].ToString()); //Id
-                curData.Add("MerchantName", subdata["MerchantName"].ToString()); //交易商户
+                var subjectType = 0;
+                curData.Add("MerchantName", MerchantAddInfoService.Query(int.Parse(subdata["MerchantId"].ToString())).CertMerchantName); //交易商户
                 curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
-                curData.Add("Status", subdata["Status"].ToString()); //交易状态(0 未支付 1 已支付)
+                var status = 0;
+                if (subdata["Status"].ToString() != "0") status = 1;
+                curData.Add("Status", status); //交易状态(0 未支付 1 已支付)
                 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("SubjectType", subdata["SubjectType"].ToString()); //主体类型(1 企业 2 个体 3 小微)
+                if (data["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
+                if (data["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
+                if (data["SubjectType"].ToString() == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
+                curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
+                dataList.Add(curData);
             }
             Other.Add("Count", count); //总数
             return dataList;

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

@@ -39,7 +39,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string MctNo = data["MctNo"].ToString(); //商户号
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
-            string condition = "";
+            string condition = " and IsAct=1 and ExamineStatus=1 and Months=10";
             if (!string.IsNullOrEmpty(MerchantName))
             {
                 condition += " and Name='" + MerchantName + "'";

Util/Main1/MerchantAddInfoUtil.cs

@@ -211,6 +211,7 @@ namespace MySystem.Service.Main1
                 condition += " and SubjectType='" + SubjectType + "'";
             }
             var query = MerchantAddInfoService.Query(condition);
+            Obj.Add("MerchantId", query.Id); //商户Id
             Obj.Add("MerchantName", query.CertMerchantName); //商户名称
             Obj.Add("Mobile", query.MobilePhone); //手机号码
             Obj.Add("MakerCode", UsersService.Query(MerchantInfoService.Query(query.Id).UserId).MakerCode); //所属创客
@@ -220,9 +221,9 @@ namespace MySystem.Service.Main1
             Obj.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体)
             Obj.Add("AliPID", query.AlipayPid); //支付宝PID
             Obj.Add("WeChatNo", query.SubMchid); //微信商户号
-            Obj.Add("OrderCount", ""); //订单总数
-            Obj.Add("TradeAmount", ""); //营业总金额
-            Obj.Add("InComeAmount", ""); //实收总金额
+            Obj.Add("OrderCount", ConsumerOrdersService.Count(" and Status>0 and MerchantId=" + query.Id + "")); //订单总数
+            Obj.Add("TradeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + query.Id + "", "PayMoney")); //营业总金额
+            Obj.Add("InComeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + query.Id + "", "MerchantActualAmount")); //实收总金额
             return Obj;
         }
         #endregion

Util/Main1/MerchantInfoUtil.cs

@@ -40,6 +40,31 @@ namespace MySystem.Service.Main1
         }
         #endregion
 
+        #region 通过主体类型查询商户Id
+        /// <summary>
+        /// 通过主体类型查询商户Id
+        /// </summary>
+        /// <param name="SubjectType">主体类型</param>
+        /// <returns></returns>
+        public static string QueryMerchantIdBySubjectType(string SubjectType)
+        {
+            var info = "";
+            List<RelationData> relationData = new List<RelationData>();
+            var merAddInfo = MerchantAddInfoService.List(relationData," and SubjectType='" + SubjectType + "'",1,9999);
+            if (merAddInfo.Count > 0)
+            {
+                var merIds = "";
+                foreach (Dictionary<string, object> dic in merAddInfo)
+                {
+                    var MerchantId = int.Parse(dic["Id"].ToString());
+                    merIds += MerchantId + ",";
+                }
+                info = merIds.TrimEnd(',');
+            }
+            return info;
+        }
+        #endregion
+
         #region 主体类型
         /// <summary>
         /// 主体类型

Util/Main2/MerchantAddInfoUtil.cs

@@ -196,6 +196,7 @@ namespace MySystem.Service.Main2
                 condition += " and SubjectType='" + SubjectType + "'";
             }
             var query = MerchantAddInfoService.Query(condition);
+            Obj.Add("MerchantId", query.Id); //商户Id
             Obj.Add("MerchantName", query.CertMerchantName); //商户名称
             Obj.Add("Mobile", query.MobilePhone); //手机号码
             Obj.Add("MakerCode", UsersService.Query(MerchantInfoService.Query(query.Id).UserId).MakerCode); //所属创客
@@ -205,9 +206,9 @@ namespace MySystem.Service.Main2
             if (query.SubjectType == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
             Obj.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
             Obj.Add("MatchNo", query.MchtNo); //商户号
-            Obj.Add("OrderCount", ""); //订单总数
-            Obj.Add("TradeAmount", ""); //营业总金额
-            Obj.Add("InComeAmount", ""); //实收总金额
+            Obj.Add("OrderCount", ConsumerOrdersService.Count(" and Status>0 and MerchantId=" + query.Id + "")); //订单总数
+            Obj.Add("TradeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + query.Id + "", "PayMoney")); //营业总金额
+            Obj.Add("InComeAmount", ConsumerOrdersService.Sum(" and Status>0 and MerchantId=" + query.Id + "", "MerchantActualAmount")); //实收总金额
             return Obj;
         }
         #endregion

Util/Main2/MerchantInfoUtil.cs

@@ -39,6 +39,31 @@ namespace MySystem.Service.Main2
         }
         #endregion
 
+        #region 通过主体类型查询商户Id
+        /// <summary>
+        /// 通过主体类型查询商户Id
+        /// </summary>
+        /// <param name="SubjectType">主体类型</param>
+        /// <returns></returns>
+        public static string QueryMerchantIdBySubjectType(string SubjectType)
+        {
+            var info = "";
+            List<RelationData> relationData = new List<RelationData>();
+            var merAddInfo = MerchantAddInfoService.List(relationData," and SubjectType='" + SubjectType + "'",1,9999);
+            if (merAddInfo.Count > 0)
+            {
+                var merIds = "";
+                foreach (Dictionary<string, object> dic in merAddInfo)
+                {
+                    var MerchantId = int.Parse(dic["Id"].ToString());
+                    merIds += MerchantId + ",";
+                }
+                info = merIds.TrimEnd(',');
+            }
+            return info;
+        }
+        #endregion
+
         #region 主体类型
         /// <summary>
         /// 主体类型