添加进件渠道标识Kind

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -102,6 +102,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             // Obj.Add("SignUrl", addInfo.WeChatSignUrl);
 
             // Obj.Add("SubjectType", addInfo.SubjectType);
+            Obj.Add("Kind", 2); //通道(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>>();
@@ -220,6 +221,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             MerchantInfo query = new MerchantInfo();
             int Id = int.Parse(function.CheckInt(data.getItem("Id").ToString()));
             query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
+            Obj.Add("Kind", 2); //通道(1 直连 2 银联)
             Obj.Add("Name", query.Name); //名称
             Obj.Add("Status", ""); //签约状态
             Obj.Add("Platforms", ""); //品台列表
@@ -358,6 +360,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data.getItem("Id").ToString()));
             MerchantInfo merchant = MerchantInfoService.Query(Id);
             MerchantAddInfo addinfo = MerchantAddInfoService.Query(Id);
+            Obj.Add("Kind", 2); //通道(1 直连 2 银联)
             Obj.Add("MerchantName", merchant.Name); //商户名称
             Obj.Add("LegalName", addinfo.CertLegalPerson); //企业法人
             Obj.Add("MerchantMobile", addinfo.MobilePhone); //商户手机号
@@ -713,6 +716,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", 2); //通道(1 直连 2 银联)
             Obj.Add("Name", query.Name); //名称
             Obj.Add("Mobile", query.Mobile); //手机号
             Obj.Add("IsAuth", query.IsAuth); //是否认证
@@ -792,6 +796,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             MerchantQrCode code = MerchantQrCodeService.Query(Sn);
             MerchantInfo query = MerchantInfoService.Query(code.MerchantId);
             MerchantParamSet set = MerchantParamSetService.Query(code.MerchantId);
+            Obj.Add("Kind", 2); //通道(1 直连 2 银联)
             Obj.Add("Name", query.Name); //名称
             Obj.Add("Mobile", query.Mobile); //手机号
             Obj.Add("IsAuth", query.IsAuth); //是否认证

Util/Main/MerchantAddInfoUtil.cs

@@ -155,7 +155,7 @@ namespace MySystem
                 if (MerchantAddInfoService.Exist(Id))
                 {
                     MerchantAddInfo addinfo = MerchantAddInfoService.Query(Id);
-                    if(addinfo.HdStatus == 0)
+                    if (addinfo.HdStatus == 0)
                     {
                         Fields.Add("Status", 0);
                         Fields.Add("WeChatRemark", null);
@@ -185,6 +185,7 @@ namespace MySystem
         {
             var query = MerchantAddInfoService.Query(Id);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
+            Obj.Add("Kind", 2); //通道(1 直连 2 银联)
             Obj.Add("ContactName", query.ContactName); //管理员姓名
             Obj.Add("ContactIdNumber", query.ContactIdNumber); //管理员身份证件号码
             Obj.Add("OpenId", query.OpenId); //管理员微信openid

Util/WorkSpace/WorkSpaceUtil.cs

@@ -50,7 +50,8 @@ namespace MySystem
             Obj.Add("TotalAmount", TotalAmount.ToString("f2")); //营总收益
             MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
             decimal AllocationAmount = merchant.ActMaxAmount - merchant.ActCurrentAmount;
-            if(AllocationAmount < 0) AllocationAmount = 0;
+            if (AllocationAmount < 0) AllocationAmount = 0;
+            Obj.Add("Kind", 2); //通道(1 直连 2 银联)
             Obj.Add("AllocationAmount", AllocationAmount); //未分配活动金额
             Obj.Add("TotalOrder", TotalOrder); //累计订单
             Obj.Add("TotalUser", TotalUser); //会员数