Sfoglia il codice sorgente

添加进件渠道标识Kind

DuGuYang 7 mesi fa
parent
commit
8cabfc398e

+ 1 - 0
Areas/Api/Controllers/v1/MainServer/MerchantAddInfoController.cs

@@ -196,6 +196,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Dictionary<string, string> AccountTypes = GetAccountTypes();
             MerchantAddInfo query = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
             List<SettleData> Settles = GetSettles(query.SubjectType);
+            Obj.Add("Kind", 1); //通道(1 直连 2 银联)
             Obj.Add("ContactName", query.ContactName); //管理员姓名
             Obj.Add("ContactIdNumber", query.ContactIdNumber); //管理员身份证件号码
             Obj.Add("OpenId", query.OpenId); //管理员微信openid

+ 5 - 0
Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -244,6 +244,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
             MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
             MerchantAddInfo addinfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
+            Obj.Add("Kind", 1); //通道(1 直连 2 银联)
             Obj.Add("MerchantName", merchant.Name); //商户名称
             Obj.Add("LegalName", addinfo.CertLegalPerson); //企业法人
             Obj.Add("MerchantMobile", addinfo.MobilePhone); //商户手机号
@@ -543,6 +544,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
             MerchantInfo query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
             MerchantAddInfo addInfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
+            Obj.Add("MerchantChannel", 1); //商户进件渠道(1 直连 2 银联)
             Obj.Add("Name", query.Name); //名称
             Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交时间
             List<Dictionary<string, object>> AuditResult = new List<Dictionary<string, object>>();
@@ -695,6 +697,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 TotalActual += decimal.Parse(dic["TotalActual"]);
                 Start = Start.AddDays(1);
             }
+            Obj.Add("MerchantChannel", 1); //商户进件渠道(1 直连 2 银联)
             Obj.Add("TotalAmount", TotalAmount); //营总收益
             Obj.Add("TotalOrder", TotalOrder); //累计订单
             Obj.Add("TotalUser", TotalUser); //会员数
@@ -800,6 +803,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
             MerchantInfo query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
             MerchantAddInfo merchantAddInfo = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
+            Obj.Add("Kind", 1); //通道(1 直连 2 银联)
             Obj.Add("Name", query.Name); //名称
             Obj.Add("Mobile", query.Mobile); //手机号
             Obj.Add("IsAuth", query.IsAuth); //是否认证
@@ -891,6 +895,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
                 MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
                 MerchantParamSet set = new MerchantParamSetService().Query(code.MerchantId);
+                Obj.Add("Kind", 1); //通道(1 直连 2 银联)
                 Obj.Add("Name", query.Name); //名称
                 Obj.Add("Mobile", query.Mobile); //手机号
                 Obj.Add("IsAuth", query.IsAuth); //是否认证

+ 1 - 1
Util/BusinessUtil.cs

@@ -68,7 +68,7 @@ namespace MySystem
                 curData.Add("WeChatInFactAmount", decimal.Parse(subdata["WeChatInfactAmount"].ToString()).ToString("f2")); //微信实收
                 curData.Add("AliPayInFactAmount", decimal.Parse(subdata["AliPayInFactAmount"].ToString()).ToString("f2")); //支付宝实收
                 curData.Add("OrderCount", subdata["OrderCount"].ToString()); //订单数
-                curData.Add("Kind", 2); //通道(1 直连 2 银联)
+                curData.Add("Kind", 1); //通道(1 直连 2 银联)
                 dataList.Add(curData);
             }
             return dataList;