调整微信和支付宝进件逻辑

AppStart/Alipay/AlipayFunction.cs

@@ -268,16 +268,17 @@ namespace MySystem
 
 
         //小程序
-        string MiniAppId = "2021003116654736";
+        string MiniAppId = "2021004100642805";
         //应用公钥
         // string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnTchC1mU0rFnRv8/eqDz1i/gS5Wd5fDD/TobKDBlj1UgQPRnT9g8wy/uTtqMnImR09ZQ5C/Ekw8B2GlN6bLbza0+7Fym7rNNKw3EvEL8tQ6pMe1GbIu68tCEjIslPXswGCgGRI30LeSj0BElaSAaqbvvyTHp+vxNLwav/hSGokPa8C76SzgCpvvzjXk9oGiNV5eutdoWEKbwyvw45kv70JHragNANTqU8DouzPLHenoD5V+QqJw1He9mZSb08QgSHCFW1dau8Hmxy0oXsfUVXXHJfzkhoyJOerYiR+oVuRqaIIF9xFlUPsNdpsAnJCP+HaAqRJpvuKfV4hNdg7uvIQIDAQAB";
         //支付宝公钥
-        string MiniAlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxycehrmnTl2IaIAECP+0HWc1eWGM/T6x022K7K6fdf+xoyC97TBJaG4G3Bcon4gsJX+Sad5IA9OJIQ4eN1joM35hIlwcFZ6MmCuVXx/SMAKThIjK0jsRc6aTxVQG+GVCgS7dXMKb4Sm+vK2wEM6xtDeqcfYMB0BqGZRvxbIV59a2ooPrha4FkV6nNC9DQefzC0picHXV64oYUjMM2ed4ASTQVds7HP9BZfalz//APZcWdBV08f+xv7n79Twz/gNtVAadfuTAlcjsS6aK+G/OrZtr/diuemeRPRUKlVhcr5xOQDhqBgtdIw8M9Wp6I4ULXRlthKVBWToH9j6n9vDIiwIDAQAB";
+        string MiniAlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxuS3Edgrruau8SO2DsK0f2KcE+A6pGJ1f8CdL395qwoX5RnEx9yRUotkwN0ZF6qMUojFKu/J/X2DpxBWBc6jIa+cnFwPUykefXcXj/AQsgiIbFzNXBH9NSz+hngXP6xDs8D1u9h+fJB+TYD+WFXKwOcGwcx23uHLHUDi1UIEZOhT2Eui+aMCYVygUWH7JynTtbFQZyZcSsD2Dxj5OJNJlK110jarFgvqY98WxqtaRtB9Y8whwRRlGfa5GP2r/Vt3xbGeAflRl5khFgRLZgeFIfxJpEj1TZV2tCtpFS0uhXJGEQbMnzFynx8UaOx/0hBCyik1MQuu3flym6nx7XxPSQIDAQAB";
+        string MiniPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmIK2EVxir9uspaS96y2giySdjv8jpekg8ZaLUluTv5DxbYbacAAVIxPs19yT2saFVhb3Qhwcx/03913J0v8DjEDQqiySZqV5y9z+C5NXGTGp5PyQK4q1wdAtg2TKkHlMRPrN/nhaFDEu6Hehoub1xEPm06qQU44A77yMnrZ5YJcS/Cv22lvcikVp6sThPmBMmmA+BF/v6hufYGWRlnWoAhl2lfmR9kSfuH1dGp/OT0WiDF7WD8ZR4iPAM8bpvBuq/UDiHBaZMJogtqkzBDH4EqiD+Tzg0ALn5zbSRiTk+GebjZNPkaW68v0LpyWOt8wbOmjh9EyaW4gEMOHxrJzZHwIDAQAB";
         //应用私钥
-        string MiniPrivateKey = "MIIEogIBAAKCAQEAnTchC1mU0rFnRv8/eqDz1i/gS5Wd5fDD/TobKDBlj1UgQPRnT9g8wy/uTtqMnImR09ZQ5C/Ekw8B2GlN6bLbza0+7Fym7rNNKw3EvEL8tQ6pMe1GbIu68tCEjIslPXswGCgGRI30LeSj0BElaSAaqbvvyTHp+vxNLwav/hSGokPa8C76SzgCpvvzjXk9oGiNV5eutdoWEKbwyvw45kv70JHragNANTqU8DouzPLHenoD5V+QqJw1He9mZSb08QgSHCFW1dau8Hmxy0oXsfUVXXHJfzkhoyJOerYiR+oVuRqaIIF9xFlUPsNdpsAnJCP+HaAqRJpvuKfV4hNdg7uvIQIDAQABAoIBACrMZDmDxIjq9JOWTwCiKl8nn2bULyz2s1QPam8xZaR0ZxhnsGxDEJ+OP9DFnDvNE57YnCLSgjAKiNUSLbyuDTpbrGKKAoO+2gYbdHBPyB2+BP9reZ15GIabj0n3Y0bubzRUSQiGoG+R66pr0IRi0f9dAzUBWpIR9y0TI/wGOHSZmQ92CgTbdmimtUNxE17vF1jaiahDzvJ1MMag0iAbCXybe48eccURKNYOTm+CuQvykBExZyN45ppKQte4YMCCIqy8VlNlAaRQtcwsQjnWh6leLitfNSfSXV+14Zzyyb/acNPGv6Hq0sw4JlQiFOaoyBVSYqapaa2l7J0RCGs5HrECgYEAzerndj/KUh2YCc2zeC7RdjbsXY2w3wTvVPTZ5DTfhJe1+xGTMC1GXLqfdPrN94DoIhvAjQsNPM9lZES32S35KI73uauxVoVr0wP8RQr8VrVUZhkvUSfLy/u5/Y6iRMnq2oM58GxeBYzewKBUN4Spm62Rl1rosvxRCO2SHw8AFW0CgYEAw3PdjlzwJYlcIx04963oGcEXpPjYg2vpJwJ+GJYWKZlp7xL5bUrDiO8BYr1V5Gmcusa3RgKLxOCZZyEenkglhg64IITa9bT9R/yjaKQBQsiTDnWHogijnkn2Oh7Z5JymBG3OCgbU6eSLr1g7y3PypZ49Ur5cBqV49jVhsq3R1AUCgYANhSHjarbPA3BrHF1vQ6uvFlYYomf9jKZmLplr2WjfnNJvBK1kWWSoS/ySQrFpUcZsDuRqnlIlLvzaQ4TKtrEIT7LGNxaytpnoxfc3VUxSKR+8gGTR8En6P7HriwTufU91P257cbIOrTwm65/78TLtrMzFYkurDNQJQQf6EBMSVQKBgEypIGhbSZHfe3UGXDbBTjzzwHtjY0DAzZUQZDbuf0jXtHYiAhT88w69d9SroInTZrbXhEEAdKPG2ERb+C9q6tTW5x9SHLOsxn86tzkuwpPYKd3M+WLzcoF+TwZi3WHOk0s/akYCgfYvPx6KRAG7u5t8Il9W7K9qrbQcIfK8PIWlAoGAB+Nn+C7GGXYtEOWyJo4SqTYpaVJBdyqbq+UighHXQD0wci8b3E35SsR/QqDAvOgEpKhmjrt63KcfdJax4VztPwroKRTz+Iy/HwGcBSVwnUn8XPTlHFkTufUtPScWuYjSXTJ+MyIMif2rcaJubvSGyZOKNMbcvAQx5tnNbF5SrVU=";
+        string MiniPrivateKey = "MIIEowIBAAKCAQEAmIK2EVxir9uspaS96y2giySdjv8jpekg8ZaLUluTv5DxbYbacAAVIxPs19yT2saFVhb3Qhwcx/03913J0v8DjEDQqiySZqV5y9z+C5NXGTGp5PyQK4q1wdAtg2TKkHlMRPrN/nhaFDEu6Hehoub1xEPm06qQU44A77yMnrZ5YJcS/Cv22lvcikVp6sThPmBMmmA+BF/v6hufYGWRlnWoAhl2lfmR9kSfuH1dGp/OT0WiDF7WD8ZR4iPAM8bpvBuq/UDiHBaZMJogtqkzBDH4EqiD+Tzg0ALn5zbSRiTk+GebjZNPkaW68v0LpyWOt8wbOmjh9EyaW4gEMOHxrJzZHwIDAQABAoIBAARdmYCduGV4UFTdhmI5CCNzhN8XBpo1NjA0MwDEhlIxf/e2qIIUPoamh10Wf1T/4ck5FxLZYymGYhe+o4xaqGtXX6G/bOFrUzU2uj7ylMev2EEpyaa1bcaCgwsD05iXIEvJMiRapZl2XvVgl0vmeJqJpw3gEAmUQwqZxxyz9H2DSkPMaSqJFczM5vmOUCnf+gK5BTgO9H12r+IeoxfU1inu3tyuqlUAHbPmKFrQ4hJoiqHXMZKxddBxhSwfxkJj0494WErRsXdFqcu1CFtV8g2dXdrXCGsFq0cNl3Rq0sge/Q6otHrIIFLA7rRHEPe6Ub2uodQLpn0s+QTDC/nMVmECgYEAxwM5d63vht6FVIf4G1UnIOFqaPawpUmoxO2srNQtSlU+Jqi7aEXW4XNYihgZtIotmTaCHBwHrxPkdYI7kz2jn0WQmcnDjEwnARR1phOSJ+yCPUCbWMwQcorxaQn3gYu1ndoED87rqiUhTogyslTGvMeC7NIFnoLpWEn5UN7eQFsCgYEAxC6e2e1YF7vBwHHoYFvUwF57klBA9N9VMaw80mjGLuaTJwyxeFYH2QOpbeVs3upmfmmJSuOAVzg7QBkgBw0x6Wzrz831rCWGFRNZwDLnIP5h2G7SNmeNKe+HqV7M4jQ7Yelbgvgi/U6BedEyjfM4ekldBJkRsPP8QcWaeNeG5Y0CgYEAnZb4EsUxP2NFwUJKPZqYeXkGgkeWacyCUC7E5ba+hnYp2QMUI+Xp2m00V2XuNQCWSxTWwtuPWhwudL7D3jyZLK4xaxZSOu6ylDBXWUN2IRcvqsFWQmKVQ56yu7Kgw3yWPIE/ZiU8iGcOkNlZC84F8ccq7c0BlhukG724J0nURLECgYAWXTYwo7TqJ7ZDqPiTm4RaVasCl/F/uMHugrMATX9iM1jNF85XaH9GhvtWktPhaZk7ie5jwiGMT9W5TePvydpJwOf07Ya3FCP/3Q/bMDJW+YjP8no2R4G5KRwu+6ahltC6La8H9B+Q/tUVvPplYjerARgAgS6aHIZCPTOJ2RAAtQKBgGpJtAIZ8sE4wVCDwd1zuVTF40SkUeeoU6dRNVFV1Z++S4XHbjEGLf8ee95kpCv1jL1W70kh50zqSJP+3DnqOeTOvVudhTwBdtDd9YapmJMHh6vObP1WSXStq/LzULK2N8jxWiMJo32lE4HwsO3rH9aRe2ioObqo4zd+C6ZSzfqo";
 
         //小程序AES密钥，目前用于解密手机号
-        string Key = "2Krm6dSew4NAL+l0mQf0fA==";
+        string Key = "CxMrVGoYbx+XCEqGqJkP/A==";
         public string GetAlipayUserId(string Auth_code)
         {
             string result = "";
@@ -290,9 +291,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;
+                // 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)
             {

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

@@ -180,40 +180,41 @@ namespace MySystem.Areas.Api.Controllers.v1
             string encryptedData = data["encryptedData"].ToString(); //微信小程序获取手机号的数据包
             // string iv = data["iv"].ToString(); //微信小程序获取手机号的IV
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            string UserIdString = new AlipayFunction(_accessor.HttpContext).GetAlipayUserId(code);
-            string AlipayUserId = UserIdString.Split('|')[0];
+            string openid = new AlipayFunction(_accessor.HttpContext).GetAlipayUserId(code);
+            // string AlipayOpenId = UserIdString.Split('|')[0];
             string mobile = new AlipayFunction(_accessor.HttpContext).GetAlipayMobile(encryptedData);
             if (mobile.StartsWith("success|"))
             {
                 mobile = mobile.Split('|')[1];
             }
             int ConsumerId = 0;
-            ConsumerOpenIds check = ConsumerOpenIdsDbconn.Instance.Get(AlipayUserId);
+            Consumers check = maindb.Consumers.FirstOrDefault(m => m.AlipayUserId == openid);
             if (check == null)
             {
-                // ConsumerId = PublicFunction.MakeConsumerId();
-                Consumers consumer = new Consumers()
+                check = maindb.Consumers.Add(new Consumers()
                 {
-                    Id = ConsumerId,
                     CreateDate = DateTime.Now,
-                    NickName = "码牌用户" + function.get_Random(6),
+                    // NickName = filterEmoji(nickName),
                     // HeadPhoto = avatarUrl,
-                    Mobile = mobile,
-                    AlipayUserId = AlipayUserId,
-                };
-                check = new ConsumerOpenIds()
+                    // Mobile = mobile,
+                    AlipayUserId = openid,
+                }).Entity;
+                maindb.SaveChanges();
+                ConsumerId = check.Id;
+                maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
                 {
-                    OpenId = AlipayUserId,
+                    OpenId = openid,
                     ConsumerId = ConsumerId,
-                };
+                });
+                maindb.SaveChanges();
             }
             else
             {
-                Consumers consumer = ConsumersDbconn.Instance.Get(check.ConsumerId);
-                // consumer.NickName = filterEmoji(nickName);
-                // consumer.HeadPhoto = avatarUrl;
-                consumer.Mobile = mobile;
-                ConsumerId = check.ConsumerId;
+                // check.NickName = filterEmoji(nickName);
+                // check.HeadPhoto = avatarUrl;
+                // check.Mobile = mobile;
+                ConsumerId = check.Id;
+                maindb.SaveChanges();
             }
             Obj.Add("ConsumerId", ConsumerId); //消费者Id
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };

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

@@ -381,37 +381,57 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<SettleData> GetPersonSettleItems()
         { 
             List<SettleData> dic = new List<SettleData>();
-            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "食品生鲜", text = "酒类", code = "C_C05_5921", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", code = "C_C05_5422", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "私立/民营医院/诊所", text = "医疗服务", code = "P_P01_8011", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "药品、药品经营者（批发商）", code = "B_B04_5122", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "医疗器械", code = "B_B04_5047", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "游艺厅/KTV", code = "D_D01_7999", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "网吧", code = "D_D01_7999", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "宠物医院", text = "宠物及宠物用品", code = "C_C10_5995", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "公共交通", code = "A_A01_4121", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "旅行住宿", code = "A_A04_7011", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "公共仓储、集装整理", code = "A_A02_4225", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "商业服务", code = "S_S05_7338", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "汽车租赁和服务", code = "S_S10_7512", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "生活服务", code = "S_S08_7295", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "百货商城", code = "C_C04_5411", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "服饰鞋包", code = "C_C06_5699", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "家居家纺建材", code = "C_C03_5211", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "母婴玩具", code = "C_C02_5641", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "数码家电", code = "C_C07_5732", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "图书音像", code = "C_C09_5942", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "文化玩乐宠物", code = "C_C10_5995", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "彩票", code = "D_D03_7995", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "娱乐票务", code = "D_D01_7999", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "法律咨询和律师事务所", code = "P_P04_8111", value = "719", special = 1});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "办公用品", code = "B_B01_5943", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "工业产品", code = "B_B02_5065", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "汽车和运输工具", code = "B_B03_5599", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "专业咨询", code = "P_P04_8999", value = "719", special = 0});
-            dic.Add(new SettleData() { ptext = "话费通讯", text = "话费充值与缴费", code = "D_D04_4815", value = "720", special = 1});
-            dic.Add(new SettleData() { ptext = "加油", text = "加油站、服务站", code = "B_B03_5541", value = "721", special = 1});
+            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 = "716", code = "A0002_B0043" });
+
+
+            // dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "酒类", code = "C_C05_5921", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", code = "C_C05_5422", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "私立/民营医院/诊所", text = "医疗服务", code = "P_P01_8011", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "药品、药品经营者（批发商）", code = "B_B04_5122", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "医疗器械", code = "B_B04_5047", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "游艺厅/KTV", code = "D_D01_7999", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "网吧", code = "D_D01_7999", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "宠物医院", text = "宠物及宠物用品", code = "C_C10_5995", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "公共交通", code = "A_A01_4121", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "旅行住宿", code = "A_A04_7011", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "公共仓储、集装整理", code = "A_A02_4225", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "商业服务", code = "S_S05_7338", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "汽车租赁和服务", code = "S_S10_7512", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "生活服务", code = "S_S08_7295", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "百货商城", code = "C_C04_5411", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "服饰鞋包", code = "C_C06_5699", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "家居家纺建材", code = "C_C03_5211", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "母婴玩具", code = "C_C02_5641", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "数码家电", code = "C_C07_5732", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "图书音像", code = "C_C09_5942", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "文化玩乐宠物", code = "C_C10_5995", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "彩票", code = "D_D03_7995", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "娱乐票务", code = "D_D01_7999", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "法律咨询和律师事务所", code = "P_P04_8111", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "办公用品", code = "B_B01_5943", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "工业产品", code = "B_B02_5065", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "汽车和运输工具", code = "B_B03_5599", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "专业咨询", code = "P_P04_8999", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "话费通讯", text = "话费充值与缴费", code = "D_D04_4815", value = "720", special = 1});
+            // dic.Add(new SettleData() { ptext = "加油", text = "加油站、服务站", code = "B_B03_5541", value = "721", special = 1});
             return dic;
         }
         public List<Dictionary<string, object>> GetPersonSettles()
@@ -444,22 +464,44 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<SettleData> GetBusinessSettleItems()
         {
             List<SettleData> dic = new List<SettleData>();
-            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "716", special = 0});
-            dic.Add(new SettleData() { ptext = "电商平台", text = "电商平台", code = "C_C05_5814", value = "716", special = 0});
-            dic.Add(new SettleData() { ptext = "食品生鲜", text = "酒类", code = "C_C05_5921", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", code = "C_C05_5422", value = "716", special = 0});
-            dic.Add(new SettleData() { ptext = "电信运营商/宽带收费", text = "电信通讯", code = "D_D04_4814", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "私立/民营医院/诊所", text = "医疗服务", code = "P_P01_8011", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "医疗器械", code = "B_B04_5047", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "药品、药品经营者（批发商）", code = "B_B04_5122", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "游艺厅/KTV", code = "D_D01_7999", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "网吧", code = "D_D01_7999", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "宠物医院", text = "宠物及宠物用品", code = "C_C10_5995", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "旅行社", text = "旅行社和旅游服务", code = "A_A04_4722", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "宗教组织", text = "宗教物品", code = "C_C10_5973", value = "716", special = 0});
-            dic.Add(new SettleData() { ptext = "宗教组织", text = "其他宗教服务", code = "P_P04_8999", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "文物经营/文物复制品销售", text = "文物经营/文物复制品销售", code = "C_C10_5971", value = "716", special = 1});
-            dic.Add(new SettleData() { ptext = "拍卖典当", text = "典当行", code = "S_S04_5933", value = "716", special = 1});
+            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 = "餐饮", code = "C_C05_5814", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "电商平台", text = "电商平台", code = "C_C05_5814", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "酒类", code = "C_C05_5921", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", code = "C_C05_5422", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "电信运营商/宽带收费", text = "电信通讯", code = "D_D04_4814", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "私立/民营医院/诊所", text = "医疗服务", code = "P_P01_8011", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "医疗器械", code = "B_B04_5047", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "药品、药品经营者（批发商）", code = "B_B04_5122", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "游艺厅/KTV", code = "D_D01_7999", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "网吧", code = "D_D01_7999", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "宠物医院", text = "宠物及宠物用品", code = "C_C10_5995", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "旅行社", text = "旅行社和旅游服务", code = "A_A04_4722", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "宗教组织", text = "宗教物品", code = "C_C10_5973", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "宗教组织", text = "其他宗教服务", code = "P_P04_8999", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "文物经营/文物复制品销售", text = "文物经营/文物复制品销售", code = "C_C10_5971", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "拍卖典当", text = "典当行", code = "S_S04_5933", value = "716", special = 1});
             // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "公共交通", code = "A_A01_4121", value = "716", special = 0});
             // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "旅行住宿", code = "A_A04_7011", value = "716", special = 0});
             // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "公共仓储、集装整理", code = "A_A02_4225", value = "716", special = 0});
@@ -480,15 +522,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "工业产品", code = "B_B02_5065", value = "716", special = 0});
             // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "汽车和运输工具", code = "B_B03_5599", value = "716", special = 0});
             // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "专业咨询", code = "P_P04_8999", value = "716", special = 0});
-            dic.Add(new SettleData() { ptext = "话费通讯", text = "话费充值与缴费", code = "D_D04_4815", value = "728", special = 1});
-            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他", text = "婚介服务", code = "S_S08_7273", value = "728", special = 0});
-            dic.Add(new SettleData() { ptext = "门户论坛/网络广告及推广/软件开发/其他互联网服务", text = "计算机服务/其他", code = "D_D05_7372", value = "711", special = 0});
-            dic.Add(new SettleData() { ptext = "快递", text = "快递服务", code = "A_A02_4215", value = "717", special = 1});
-            dic.Add(new SettleData() { ptext = "加油", text = "加油站、服务站", code = "B_B03_5541", value = "717", special = 1});
-            dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业（电、气、水）", code = "S_S06_4900", value = "730", special = 1});
-            dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-电力缴费", code = "S_S06_4901", value = "730", special = 1});
-            dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-煤气缴费", code = "S_S06_4902", value = "730", special = 1});
-            dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-自来水缴费", code = "S_S06_4903", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "话费通讯", text = "话费充值与缴费", code = "D_D04_4815", value = "728", special = 1});
+            // dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他", text = "婚介服务", code = "S_S08_7273", value = "728", special = 0});
+            // dic.Add(new SettleData() { ptext = "门户论坛/网络广告及推广/软件开发/其他互联网服务", text = "计算机服务/其他", code = "D_D05_7372", value = "711", special = 0});
+            // dic.Add(new SettleData() { ptext = "快递", text = "快递服务", code = "A_A02_4215", value = "717", special = 1});
+            // dic.Add(new SettleData() { ptext = "加油", text = "加油站、服务站", code = "B_B03_5541", value = "717", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业（电、气、水）", code = "S_S06_4900", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-电力缴费", code = "S_S06_4901", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-煤气缴费", code = "S_S06_4902", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-自来水缴费", code = "S_S06_4903", value = "730", special = 1});
             return dic;
         }
         public List<Dictionary<string, object>> GetBusinessSettles()

MySystem.csproj

@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-svcutil" Version="1.0.*"/>
+    <DotNetCliToolReference Include="dotnet-svcutil" Version="1.0.*" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Areas\"/>
-    <Folder Include="Areas\Admin\"/>
-    <Folder Include="Areas\Api\"/>
-    <Folder Include="Areas\Web\"/>
-    <Folder Include="Areas\Admin\Controllers\"/>
-    <Folder Include="Areas\Admin\Views\"/>
-    <Folder Include="Areas\Web\Controllers\"/>
-    <Folder Include="Areas\Web\Views\"/>
-    <Folder Include="Areas\Api\Controllers\"/>
-    <Folder Include="PublicClass\"/>
-    <Folder Include="AppStart\"/>
-    <Folder Include="Views\Home\"/>
-    <Folder Include="Areas\Admin\Views\Home\"/>
-    <Folder Include="Areas\Web\Views\Article\"/>
-    <Folder Include="PublicClass\GraphQL\"/>
-    <Folder Include="PublicClass\GraphQL\Types\"/>
-    <Folder Include="Areas\Web\Views\Page\"/>
-    <Folder Include="Areas\Web\Views\Pay\"/>
-    <Folder Include="AppStart\Helper\"/>
-    <Folder Include="Areas\Api\Controllers\activity\"/>
-    <Folder Include="AppStart\Activity\"/>
+    <Folder Include="Areas\" />
+    <Folder Include="Areas\Admin\" />
+    <Folder Include="Areas\Api\" />
+    <Folder Include="Areas\Web\" />
+    <Folder Include="Areas\Admin\Controllers\" />
+    <Folder Include="Areas\Admin\Views\" />
+    <Folder Include="Areas\Web\Controllers\" />
+    <Folder Include="Areas\Web\Views\" />
+    <Folder Include="Areas\Api\Controllers\" />
+    <Folder Include="PublicClass\" />
+    <Folder Include="AppStart\" />
+    <Folder Include="Views\Home\" />
+    <Folder Include="Areas\Admin\Views\Home\" />
+    <Folder Include="Areas\Web\Views\Article\" />
+    <Folder Include="PublicClass\GraphQL\" />
+    <Folder Include="PublicClass\GraphQL\Types\" />
+    <Folder Include="Areas\Web\Views\Page\" />
+    <Folder Include="Areas\Web\Views\Pay\" />
+    <Folder Include="AppStart\Helper\" />
+    <Folder Include="Areas\Api\Controllers\activity\" />
+    <Folder Include="AppStart\Activity\" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="aliyun-net-sdk-core">
@@ -50,26 +50,27 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0"/>
-    <PackageReference Include="RabbitMQ.Client" Version="6.2.2"/>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.4.*"/>
-    <PackageReference Include="System.ServiceModel.Http" Version="4.4.*"/>
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.*"/>
-    <PackageReference Include="System.ServiceModel.Security" Version="4.4.*"/>
-    <PackageReference Include="ZKWeb.System.Drawing" Version="4.0.1"/>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.1"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0"/>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0"/>
+    <PackageReference Include="Aliyun.Api.LogService" Version="1.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.4.*" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.4.*" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.*" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.4.*" />
+    <PackageReference Include="ZKWeb.System.Drawing" Version="4.0.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="GraphQL" Version="2.4.0"/>
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0"/>
-    <PackageReference Include="MySql.Data" Version="8.0.18"/>
-    <PackageReference Include="CSRedisCore" Version="3.6.5"/>
+    <PackageReference Include="GraphQL" Version="2.4.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="MySql.Data" Version="8.0.18" />
+    <PackageReference Include="CSRedisCore" Version="3.6.5" />
   </ItemGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.3"/>
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.3" />
   </ItemGroup>
 </Project>