调通

AppStart/Alipay/AlipayFunction.cs

@@ -20,7 +20,7 @@ namespace MySystem
         private string AppId = "2021004100667901";
         private string PrivateKey = "MIIEowIBAAKCAQEAhw2C7AypN/cSBNZU1LU2th58fzvLlhlfg7jZz3xNJQwpICtSF6hXXB2qChecEZv7ZGyiuuamTn/c+ZAKJAl3EZ8fMEgTrdK9M8+3DX6FIzWywCuPktsnxLIkTj4Lt/LjPI3P3yZLESuWzHIQ+TGnwEgm/Fx5ESWribFOddLRnNpINk36y+gtaVoXpQ742Wt6Yg1l4FZrzCAOHjLfVeTyAzmXXm8TGdzep83fyCqSBp+rdpb1CGQukHYpCapyk52hM4wqsAVdndAqO5qoRi5BfuyiVs2BR6Oe+8iF4rD5FJ/Wk6QguemWX8C/4jTnuNs1YsFuCTHqYwr8k8J6ekEdgwIDAQABAoIBAEob/PsBW56NYwLqhnSO2G4JvrGnI2nDlKlYt5VnFYI98RdpDkxTIVU4JgYRvJ/hI4uRHZ9IUHyFJ8J+60GpPACce+Xnt3zMRuz2j/HEutR+dA+GF+wzfNgwFUImRBH2JAIno6lFfy316HNaKLxGJlKahWI4cGsba81MUczQGhxi04XD9eVZNdeoRpt9eXTEuojjZIQB4JImHXI6jYxjhowP86D/hQ1lz78mC9mflSF0MC5gHtjdR0MScIKsewbJlRWpOw/UNuLXUoEjcXA4YXM1CPW4uSKpPm8j3S0eNT6vE8+DGViLrH5u5YxiLOlFMdkTsdyoq9teQDQl8eCW6skCgYEAxc8hbktBDnMLyEi+6JCzMDTQ5S16fhR8fjahXP5D+2gZZcNSu4X/Z5/WEWSHwH8YOGCXeXEujXe8bEy1dJ8B8c3KDDg2xU9NsxA9N1B4BHkva/3PzhzQGjST1OIYwLZAwMDJlQxtmUNT5Ab55i8AAEO5ewi4Rq+Y3PKNeQ0a7gcCgYEArsg+nFa+8ekZsiFkl/IAe5EsJhl/NPrPhXPHsjp2y1CK3Zg2Y1hOYjBLnIi6ID6l+6uYwVKoe/UOphnIBuw9WkfdojrLAmDCge3eiXTrYTj5XnKMZZon3xDHnuEB5dTMZG2hW3BJfYUDdNYkjWmUoKD+1LmDztpDBiLC6Ubf9aUCgYAOctG7T63h009yArZHIIKmK8VyZ/8BhJePVIg21a+7hmAMidbaMbB1Ljyhqpkr21y2iX+m9Dh1RuCxfGzoptCqi+CNQfHmOaOwR6hhCPSrRvrKxZBPOtWMhHij3Rv3v5g9PBe9VloPDtbq2gOY56f1XP0IWpuzNhJRWToyNF3aMwKBgHu39snHhYXLUIsMpB4CCWFuU2fsqGSiHP8EA5kfVTN5obJVqjoMKf/K29rD1aw5bFiHEKvXjLehsWrV2Qc9dfhP4oyRPV5Di6tY6ys1fd/l6m52evb4dbyqLgNClotPZBa6m3sUMpEM9HNhmaIX2EMTcw60+p4TVVokhP+HUcSZAoGBAJkkJ1uPuKEq79zeqNEfDHFZHW+4YzT4xDlq0vm5YYhphcyr80Z0jLzGgmoRHKTfDwBHYF5TXdUsWgJEGx9jucPi0jFkK6HDAerUqG4WJc8iu+93pyYYfPIszWHEwzxEutjpUnU2HpXLMhgUXQrwSWrQpHTkuPMY8ZCQwKZ4TBMV";
         private string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhw2C7AypN/cSBNZU1LU2th58fzvLlhlfg7jZz3xNJQwpICtSF6hXXB2qChecEZv7ZGyiuuamTn/c+ZAKJAl3EZ8fMEgTrdK9M8+3DX6FIzWywCuPktsnxLIkTj4Lt/LjPI3P3yZLESuWzHIQ+TGnwEgm/Fx5ESWribFOddLRnNpINk36y+gtaVoXpQ742Wt6Yg1l4FZrzCAOHjLfVeTyAzmXXm8TGdzep83fyCqSBp+rdpb1CGQukHYpCapyk52hM4wqsAVdndAqO5qoRi5BfuyiVs2BR6Oe+8iF4rD5FJ/Wk6QguemWX8C/4jTnuNs1YsFuCTHqYwr8k8J6ekEdgwIDAQAB";
-        public string AlipayPublicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB";
+        public string AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxuS3Edgrruau8SO2DsK0f2KcE+A6pGJ1f8CdL395qwoX5RnEx9yRUotkwN0ZF6qMUojFKu/J/X2DpxBWBc6jIa+cnFwPUykefXcXj/AQsgiIbFzNXBH9NSz+hngXP6xDs8D1u9h+fJB+TYD+WFXKwOcGwcx23uHLHUDi1UIEZOhT2Eui+aMCYVygUWH7JynTtbFQZyZcSsD2Dxj5OJNJlK110jarFgvqY98WxqtaRtB9Y8whwRRlGfa5GP2r/Vt3xbGeAflRl5khFgRLZgeFIfxJpEj1TZV2tCtpFS0uhXJGEQbMnzFynx8UaOx/0hBCyik1MQuu3flym6nx7XxPSQIDAQAB";
         public AlipayFunction(HttpContext context)
         {
             _context = context;
@@ -206,6 +206,7 @@ namespace MySystem
             bizContent.Add("subject", Subject);
             // bizContent.Add("seller_id", "2088641405724089");
             bizContent.Add("buyer_id", BuyerId);
+            // bizContent.Add("buyer_open_id", BuyerId);
             bizContent.Add("timeout_express", "10m");
 
             // 结算信息，按需传入
@@ -291,11 +292,11 @@ namespace MySystem
                 requestAccess_token.Code = Auth_code;
                 AlipaySystemOauthTokenResponse responseAccess_token = client.Execute(requestAccess_token);
                 function.WriteLog(responseAccess_token.Body, "支付宝授权");
-                // string AlipayUserId = responseAccess_token.AlipayUserId; //20881043611849171819285350010300
-                // string UserId = responseAccess_token.UserId; //2088222145274001
-                // result = UserId + "|" + AlipayUserId;
-                JsonData jsonObj = JsonMapper.ToObject(responseAccess_token.Body);
-                result = jsonObj["alipay_system_oauth_token_response"]["open_id"].ToString();
+                string AlipayUserId = responseAccess_token.AlipayUserId; //20881043611849171819285350010300
+                string UserId = responseAccess_token.UserId; //2088222145274001
+                result = UserId + "|" + AlipayUserId;
+                // JsonData jsonObj = JsonMapper.ToObject(responseAccess_token.Body);
+                // result = jsonObj["alipay_system_oauth_token_response"]["open_id"].ToString();
             }
             catch (Exception ex)
             {
@@ -406,31 +407,6 @@ namespace MySystem
             // return result;
         }
 
-        public string test()
-        {
-            string result = "";
-            string str = "PsQMXBobiYsZPG5q2dbsX5Zvnee73Zpg55guE2FTxMijl+xdj+oCjEErUpZNxRK0S132GVcWBQUjFeA5fcLq1A==";
-            try
-            {
-                result = AlipayEncrypt.AesDencrypt(Key, str, "UTF-8");
-                JsonData obj = JsonMapper.ToObject(result);
-                if (obj["code"].ToString() == "10000")
-                {
-                    result = "success|" + obj["mobile"].ToString();
-                }
-                //{\"code\":\"10000\",\"msg\":\"Success\",\"mobile\":\"14781419364\"}
-            }
-            catch (Exception ex)
-            {
-                //解密异常, 记录日志        
-                function.WriteLog(ex.ToString(), "获取手机号解密异常");
-            }
-            return result;
-        }
-
-
-
-
 
 
 

AppStart/Alipay/Request/AlipaySystemOauthTokenRequest.cs

@@ -0,0 +1,137 @@
+// using System;
+// using System.Collections.Generic;
+// using Aop.Api.Response;
+
+// namespace Aop.Api.Request
+// {
+//     /// <summary>
+//     /// AOP API: alipay.system.oauth.token
+//     /// </summary>
+//     public class AlipaySystemOauthTokenRequest : IAopRequest<AlipaySystemOauthTokenResponse>
+//     {
+//         /// <summary>
+//         /// 授权码，用户对应用授权后得到。本参数在 grant_type 为 authorization_code 时必填；为 refresh_token 时不填。
+//         /// </summary>
+//         public string Code { get; set; }
+
+//         /// <summary>
+//         /// 授权方式。支持： 1.authorization_code，表示换取使用用户授权码code换取授权令牌access_token。 2.refresh_token，表示使用refresh_token刷新获取新授权令牌。
+//         /// </summary>
+//         public string GrantType { get; set; }
+
+//         /// <summary>
+//         /// 刷新令牌，上次换取访问令牌时得到。本参数在 grant_type 为 authorization_code 时不填；为 refresh_token 时必填，且该值来源于此接口的返回值 app_refresh_token（即至少需要通过 grant_type=authorization_code 调用此接口一次才能获取）。
+//         /// </summary>
+//         public string RefreshToken { get; set; }
+
+//         #region IAopRequest Members
+//         private bool  needEncrypt=false;
+//         private string apiVersion = "1.0";
+// 	    private string terminalType;
+// 	    private string terminalInfo;
+//         private string prodCode;
+// 	    private string notifyUrl;
+//         private string returnUrl;
+// 	    private AopObject bizModel;
+//         private Dictionary<string, string> udfParams; //add user-defined text parameters
+
+// 		public void SetNeedEncrypt(bool needEncrypt){
+//              this.needEncrypt=needEncrypt;
+//         }
+
+//         public bool GetNeedEncrypt(){
+
+//             return this.needEncrypt;
+//         }
+
+// 		public void SetNotifyUrl(string notifyUrl){
+//             this.notifyUrl = notifyUrl;
+//         }
+
+//         public string GetNotifyUrl(){
+//             return this.notifyUrl;
+//         }
+
+//         public void SetReturnUrl(string returnUrl){
+//             this.returnUrl = returnUrl;
+//         }
+
+//         public string GetReturnUrl(){
+//             return this.returnUrl;
+//         }
+
+//         public void SetTerminalType(String terminalType){
+// 			this.terminalType=terminalType;
+// 		}
+
+//     	public string GetTerminalType(){
+//     		return this.terminalType;
+//     	}
+
+//     	public void SetTerminalInfo(String terminalInfo){
+//     		this.terminalInfo=terminalInfo;
+//     	}
+
+//     	public string GetTerminalInfo(){
+//     		return this.terminalInfo;
+//     	}
+
+//         public void SetProdCode(String prodCode){
+//             this.prodCode=prodCode;
+//         }
+
+//         public string GetProdCode(){
+//             return this.prodCode;
+//         }
+
+//         public string GetApiName()
+//         {
+//             return "alipay.system.oauth.token";
+//         }
+
+//         public void SetApiVersion(string apiVersion){
+//             this.apiVersion=apiVersion;
+//         }
+
+//         public string GetApiVersion(){
+//             return this.apiVersion;
+//         }
+
+//         public void PutOtherTextParam(string key, string value) 
+//         {
+//             if(this.udfParams == null) 
+//             {
+//                 this.udfParams = new Dictionary<string, string>();
+//             }
+//             this.udfParams.Add(key, value);
+//         }
+
+//         public IDictionary<string, string> GetParameters()
+//         {
+//             AopDictionary parameters = new AopDictionary();
+//             parameters.Add("code", this.Code);
+//             parameters.Add("grant_type", this.GrantType);
+//             parameters.Add("refresh_token", this.RefreshToken);
+//             if(udfParams != null) 
+//             {
+//                 foreach(string key in this.udfParams.Keys)
+//                 {
+//                     parameters.Add(key, this.udfParams[key]);
+//                 }
+//             }
+//             return parameters;
+//         }
+
+// 		public AopObject GetBizModel()
+//         {
+//             return this.bizModel;
+//         }
+
+//         public void SetBizModel(AopObject bizModel)
+//         {
+//             this.bizModel = bizModel;
+//         }
+
+//         #endregion
+//     }
+// }

AppStart/Alipay/Response/AlipaySystemOauthTokenResponse.cs

@@ -0,0 +1,71 @@
+// using System;
+// using System.Xml.Serialization;
+
+// namespace Aop.Api.Response
+// {
+//     /// <summary>
+//     /// AlipaySystemOauthTokenResponse.
+//     /// </summary>
+//     public class AlipaySystemOauthTokenResponse : AopResponse
+//     {
+//         /// <summary>
+//         /// 访问令牌。通过该令牌调用需要授权类接口
+//         /// </summary>
+//         [XmlElement("access_token")]
+//         public string AccessToken { get; set; }
+
+//         /// <summary>
+//         /// 已废弃，请勿使用
+//         /// </summary>
+//         [XmlElement("alipay_user_id")]
+//         public string AlipayUserId { get; set; }
+
+//         /// <summary>
+//         /// 授权token开始时间，作为有效期计算的起点
+//         /// </summary>
+//         [XmlElement("auth_start")]
+//         public string AuthStart { get; set; }
+
+//         /// <summary>
+//         /// 令牌类型，permanent表示返回的access_token和refresh_token永久有效，非永久令牌不返回该字段
+//         /// </summary>
+//         [XmlElement("auth_token_type")]
+//         public string AuthTokenType { get; set; }
+
+//         /// <summary>
+//         /// 访问令牌的有效时间，单位是秒。
+//         /// </summary>
+//         [XmlElement("expires_in")]
+//         public string ExpiresIn { get; set; }
+
+//         /// <summary>
+//         /// 支付宝用户唯一标识
+//         /// </summary>
+//         [XmlElement("open_id")]
+//         public string OpenId { get; set; }
+
+//         /// <summary>
+//         /// 刷新令牌的有效时间，单位是秒。
+//         /// </summary>
+//         [XmlElement("re_expires_in")]
+//         public string ReExpiresIn { get; set; }
+
+//         /// <summary>
+//         /// 刷新令牌。通过该令牌可以刷新access_token
+//         /// </summary>
+//         [XmlElement("refresh_token")]
+//         public string RefreshToken { get; set; }
+
+//         /// <summary>
+//         /// union_id是支付宝用户在开放平台的唯一标识符，在配置应用分组后会返回该值。 同一用户的union_id在同一分组内应用保持一致。
+//         /// </summary>
+//         [XmlElement("union_id")]
+//         public string UnionId { get; set; }
+
+//         /// <summary>
+//         /// 支付宝用户的唯一标识。以2088开头的16位数字。
+//         /// </summary>
+//         [XmlElement("user_id")]
+//         public string UserId { get; set; }
+//     }
+// }

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

@@ -217,7 +217,14 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 return new AppResultJson() { Status = "-1", Info = "请填写正确的支付金额" };
             }
-            // PublicAccountSet set = RedisDbconn.Instance.Get<PublicAccountSet>("PublicAccountSet") ?? new PublicAccountSet();
+            
+            MerchantQrCode qrcode = MerchantQrCodeDbconn.Instance.Get(SnNo) ?? new MerchantQrCode();
+
+            // PosMachines machine = PosMachinesDbconn.Instance.Get(qrcode.SnId) ?? new PosMachines();
+            // if (machine.BindMerchantId == 0) machine.BindMerchantId = 1; // TODO: 需要绑定二维码
+            MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantInfo();
+            MerchantAddInfo merchantAdd = MerchantAddInfoDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantAddInfo();
+            MerchantParamSet merchantset = MerchantParamSetDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantParamSet();
             string openid = "";
             if (PayMode == 1)
             { 
@@ -258,13 +265,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                 ConsumerId = check.ConsumerId;
             }
             maindb.SaveChanges();
-            MerchantQrCode qrcode = MerchantQrCodeDbconn.Instance.Get(SnNo) ?? new MerchantQrCode();
-
-            // PosMachines machine = PosMachinesDbconn.Instance.Get(qrcode.SnId) ?? new PosMachines();
-            // if (machine.BindMerchantId == 0) machine.BindMerchantId = 1; // TODO: 需要绑定二维码
-            MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantInfo();
-            MerchantAddInfo merchantAdd = MerchantAddInfoDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantAddInfo();
-            MerchantParamSet merchantset = MerchantParamSetDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantParamSet();
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
             bool ActFlag = merchantset.IsAll == 1 ? false : true;

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

@@ -382,22 +382,22 @@ namespace MySystem.Areas.Api.Controllers.v1
         { 
             List<SettleData> dic = new List<SettleData>();
             dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "719", code = "A0002_B0202" });
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧/健身房/体育场馆", text = "健身房", value = "719", code = "A0004_B0064" });
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧/健身房/体育场馆", text = "体育场馆", value = "719", code = "A0004_B0068" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "公共交通", value = "719", code = "A0006_B0088" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "旅行住宿", value = "719", code = "A0010_B0157" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "生活服务", value = "719", code = "A0003_B0116" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "百货商城", value = "719", code = "A0002_B0017" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "服饰鞋包", value = "719", code = "A0002_B0026" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "家居家纺建材", value = "719", code = "A0002_B0216" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "母婴玩具", value = "719", code = "A0002_B0032" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "数码家电", value = "719", code = "A0003_B0051" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "图书音像", value = "719", code = "A0002_B0031" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "文化玩乐宠物", value = "719", code = "A0004_B0070" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "娱乐票务", value = "719", code = "A0004_B0065" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "办公用品", value = "719", code = "A0002_B0203" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "工业产品", value = "719", code = "A0002_B0042" });
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐", text = "专业咨询", value = "719", code = "A0008_B0139" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "719", code = "A0004_B0064" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value = "719", code = "A0004_B0068" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "公共交通", value = "719", code = "A0006_B0088" });
+            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value = "719", code = "A0010_B0157" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value = "719", code = "A0003_B0116" });
+            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value = "719", code = "A0002_B0017" });
+            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value = "719", code = "A0002_B0026" });
+            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value = "719", code = "A0002_B0216" });
+            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value = "719", code = "A0002_B0032" });
+            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value = "719", code = "A0003_B0051" });
+            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value = "719", code = "A0002_B0031" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value = "719", code = "A0004_B0070" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value = "719", code = "A0004_B0065" });
+            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value = "719", code = "A0002_B0203" });
+            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value = "719", code = "A0002_B0042" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "专业咨询", value = "719", code = "A0008_B0139" });
             dic.Add(new SettleData() { ptext = "其他", text = "其他类别", value = "716", code = "A0002_B0043" });
 
 
@@ -466,24 +466,23 @@ namespace MySystem.Areas.Api.Controllers.v1
             List<SettleData> dic = new List<SettleData>();
             dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", value="716", code="A0001_B0001"});
             dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value="716", code="A0002_B0202"});
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧/健身房/体育场馆", text = "	健身房", value="716", code="A0004_B0064"});
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧/健身房/体育场馆", text = "	体育场馆", value="716", code="A0004_B0068"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "公共交通", value="716", code="A0006_B0088"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "旅行住宿", value="716", code="A0010_B0157"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "汽车租赁和服务", value="716", code="A0005_B0079"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "生活服务", value="716", code="A0003_B0116"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "百货商城", value="716", code="A0002_B0017"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "服饰鞋包", value="716", code="A0002_B0026"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "家居家纺建材", value="716", code="A0002_B0216"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "母婴玩具", value="716", code="A0002_B0032"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "数码家电", value="716", code="A0003_B0051"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "图书音像", value="716", code="A0002_B0031"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "文化玩乐宠物", value="716", code="A0004_B0070"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "娱乐票务", value="716", code="A0004_B0065"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "办公用品", value="716", code="A0002_B0203"});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城", text = "工业产品", value="716", code="A0002_B0042"});
-            dic.Add(new SettleData() { ptext = "婚介服务/摄影/快递", text = "婚介服务", value="720", code="A0003_B0053"});
-            dic.Add(new SettleData() { ptext = "其他", text = "其它类别", value="716", code="A0002_B0043"});
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value="716", code="A0004_B0064"});
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value="716", code="A0004_B0068"});
+            dic.Add(new SettleData() { ptext = "城市公共交通", text = "公共交通", value="716", code="A0006_B0088"});
+            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value="716", code="A0010_B0157"});
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value="716", code="A0003_B0116"});
+            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value="716", code="A0002_B0017"});
+            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value="716", code="A0002_B0026"});
+            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value="716", code="A0002_B0216"});
+            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value="716", code="A0002_B0032"});
+            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value="716", code="A0003_B0051"});
+            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value="716", code="A0002_B0031"});
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value="716", code="A0004_B0070"});
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value="716", code="A0004_B0065"});
+            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value="716", code="A0002_B0203"});
+            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value="716", code="A0002_B0042"});
+            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他信息服务平台", text = "婚介服务", value="720", code="A0003_B0053"});
+            dic.Add(new SettleData() { ptext = "零售", text = "其它类别", value="716", code="A0002_B0043"});
 
 
             // dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "716", special = 0});

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

@@ -423,6 +423,10 @@ namespace MySystem.Areas.Api.Controllers.v1
                 if (Status == 4) Status = 2;
                 query = query.Where(m => (m.Status == Status || m.QueryCount == Status));
             }
+            if(!string.IsNullOrEmpty(SearchKey))
+            {
+                query = query.Where(m => m.Name.Contains(SearchKey));
+            }
             if (PageNum == 1)
             {
                 query = query.Take(PageSize);
@@ -482,11 +486,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             Alipay.Add("Status", addInfo.QueryCount);
             Alipay.Add("DoTime", addInfo.UpdateDate == null ? "" : addInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
             Alipay.Add("Season", addInfo.AlipayRemark);
-            Alipay.Add("SignUrl", addInfo.AlipaySignUrl.Replace("\\", ""));
+            Alipay.Add("SignUrl", function.CheckNull(addInfo.AlipaySignUrl).Replace("\\", ""));
             AuditResult.Add(Alipay);
 
             Obj.Add("Status", GetMainStatusName(addInfo.QueryCount, query.Status)); //状态
             Obj.Add("AuditResult", AuditResult); //审核结果
+            Obj.Add("SubjectType", addInfo.SubjectType);
             return Obj;
         }
         #endregion

Controllers/HomeController.cs

@@ -67,14 +67,15 @@ namespace MySystem.Controllers
             //     description = "优惠",  //分账描述
             // });
             // result = new WeChatFunction().ProfitShare("1645266943", "4200001846202306021274142861", "2023060214014405449699901", Receivers);
-
             // result = new WeChatFunction().AddReceive("1645266943", "PERSONAL_OPENID", "ooDpv5LkCKEguE-LMZO-rSV4TDpk", "", "USER");
             // result = new WeChatFunction().QueryProfitShare("1645266943", "4200001815202306025662773463", "2023060213335030713572885");
-            // result = new WeChatFunction().Unfreeze("1646405429","4200001838202306096719040741","2023060911284179905894403", "结算");
+            // result += new WeChatFunction().Unfreeze("1647917209","4200001851202306296256433756","2023062914544345583469577", "结算");
+            // result += new WeChatFunction().Unfreeze("1647917209","4200001871202306297971809063","2023062914503970424085049", "结算");
+            // result += new WeChatFunction().Unfreeze("1647917209","4200001861202306299303626271","2023062914274571909443048", "结算");
 
             // result = new WeChatFunction().ProfitShareReturn("1646405429", "1611167423", "2023060810550382756164803", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), 0.02M);
 
-            result = new WeChatFunction().GetPublicKey();
+            // result = new WeChatFunction().GetPublicKey();
 
             return result;
         }