浏览代码

修复统计

DuGuYang 2 年之前
父节点
当前提交
7dff1e2614

+ 1 - 1
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() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
-                curData.Add("MaxDivi", ConsumerProfitService.Sum(" and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
+                curData.Add("MaxDivi", ConsumerProfitService.Sum(" 1=1 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 个体)

+ 1 - 1
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() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
-                curData.Add("MaxDivi", ConsumerProfitService.Sum(" and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
+                curData.Add("MaxDivi", ConsumerProfitService.Sum(" 1=1 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; //小微

+ 21 - 0
Service/Main1/ConsumerProfitService.cs

@@ -88,6 +88,27 @@ namespace MySystem.Service.Main1
             return amount;
         }
 
+        public static Dictionary<string, string> Sums(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 ConsumerProfit 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>

+ 21 - 0
Service/Main2/ConsumerProfitService.cs

@@ -88,6 +88,27 @@ namespace MySystem.Service.Main2
             return amount;
         }
 
+        public static Dictionary<string, string> Sums(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 ConsumerProfit 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>