Commit 34f99068 by 陶然

优化

parent dc7a1e5c
......@@ -27,16 +27,23 @@ namespace Com.Bocom.OpenApi
/// </summary>
internal static string SUB_ORG_ID = "1000078266";
///// <summary>
///// 正式:智慧记账私钥
///// </summary>
//internal static string MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiBmB20Ie083EwVgUsLX/wKcYq4zGmH4T2CcLRVBzOHSt2nzM2gEQoPRzonvt+HIh9R63NGaNBsTeQCzgvpSzVuEfNFoAoA/mF0DIxxvpeoRPpYvE3+QDeO8+q14bbJcuca1j5LFQY2am2W4ALYB29EQKDi6LWws0L8xamwvNcO7nIgEyqdsc6KDhwk50KBWT68QWL3aeJUAB05+xuoyFP+eZaQV8UfYRtLGw3n6KFnf1VAnUJMbYcExQS9uOvRoeCfWtww3JEDHaMz5eGjJl78EjJNXbMjTEfSxzV3eN+Zifvff+CaNnTWKSIbR6oFkkwQglgGT/szqH12/4CjrVxAgMBAAECggEACQkwOg/EHRvOXpxRwJ5hCvzgiz5h8b441o01WKEANc08u5VJutgN4X3v9ezFKRmC618+N4Da4flvuzZ3nJAB5tljJXPM08y04QCdwRevUrEl1qK5+f7eZgQGHVJYddJg/XPdLrjy87tf6YZm7A1/ottXOmMOs38+K0ggk7IfgIRff4OEyttip6Lh4cEvxCUJtMny2/dCM7/e6i6Kp+eeRSsGNJAn3KbkBuIC69pAO/AMKnUfUmB383kZ8cW8yF7qHRGlnd0648IDUaAxesz+DNAkoj6Pn0OnZgwZb3TisBffYcLAEWXfU4s8fkL43lS3o3Lb/FGBq5F0iNGKQ/hVcQKBgQD3KWotQ2IbqFhMwW+m860CnxtBjTyUZZ4K5pqic0FLXG55mYKz1/uDwtwwurQeVW7VGCDNhN24jk/H4dqIcfHTlTDu8eNejUoXySy49sFeUKo4BHtiPd4yAsI2GIv2al4ksmMAV1ghXbGdfcFsQ3711xUX4OyBBsyyt3UlND5lDwKBgQDqG3gxij0reEHlwmH0yOFjWk4tuaJtISXHPHlfPTY9cnDosH1bbRgEyo3PCxIzdh3zOs0oJvAZTyAt0P7LNF8DRN7J7fyI3oll1amZ30ibh7A7hw2JoYO+dOnhT6h7o5wxMrw8H+6lj5abziSNIsZsvJh6wwj8J8ELjYocqho9fwKBgD/fC/k2eJv9HRR4yIm0XvlWdIy0GvueZwEaJsvkTPNUp5f0+7nODsk2CgDtvq44FbQr0A5MT5/p5uQYkYjBKWUsIMEe8Ur16DfNXSlPWxksb1Cal+gDZPA3lki0fzbmtf11u+/Soou80rGIVfvMVXriYikRjwyo3S0yC6vZnGYxAoGBAKIr60QuJhex07xsvlzKt0+S5CtKuBju6HOvEckG50cDuvGGKSCnXwcapceyPKaHgVHX/vx8lMCDjqAOciKkIdlq4QZzJQhPWFDCBR4BjhOnmE50TM11pITQCqA5BVa4zN9L7Redaz0nTcaas7lNSLVUpDAOYXADvffZ0b3vnAPTAoGADzenP6VQRb9qxY+2af7zlbfLHRk35xBaInnZyrcmeaXs/0MssCAqLTqA27xGraJ7uvjrPEchXK4STl+UD2IxtEoRamopn3ZRzB1xpBVjWST85NUbOY+aHJOTwfEMVHH3wsiUucxdLq63UFo1RGtpfb6yftTnXqtPxGEIbYPyylE=";
/// <summary>
/// MY_PRIVATE_KEY:RSA私钥,可以通过sdk包下面bin文件夹里面的工具生成一对公私钥
/// 测试:智慧记账私钥
/// </summary>
//internal static string MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiBmB20Ie083EwVgUsLX/wKcYq4zGmH4T2CcLRVBzOHSt2nzM2gEQoPRzonvt+HIh9R63NGaNBsTeQCzgvpSzVuEfNFoAoA/mF0DIxxvpeoRPpYvE3+QDeO8+q14bbJcuca1j5LFQY2am2W4ALYB29EQKDi6LWws0L8xamwvNcO7nIgEyqdsc6KDhwk50KBWT68QWL3aeJUAB05+xuoyFP+eZaQV8UfYRtLGw3n6KFnf1VAnUJMbYcExQS9uOvRoeCfWtww3JEDHaMz5eGjJl78EjJNXbMjTEfSxzV3eN+Zifvff+CaNnTWKSIbR6oFkkwQglgGT/szqH12/4CjrVxAgMBAAECggEACQkwOg/EHRvOXpxRwJ5hCvzgiz5h8b441o01WKEANc08u5VJutgN4X3v9ezFKRmC618+N4Da4flvuzZ3nJAB5tljJXPM08y04QCdwRevUrEl1qK5+f7eZgQGHVJYddJg/XPdLrjy87tf6YZm7A1/ottXOmMOs38+K0ggk7IfgIRff4OEyttip6Lh4cEvxCUJtMny2/dCM7/e6i6Kp+eeRSsGNJAn3KbkBuIC69pAO/AMKnUfUmB383kZ8cW8yF7qHRGlnd0648IDUaAxesz+DNAkoj6Pn0OnZgwZb3TisBffYcLAEWXfU4s8fkL43lS3o3Lb/FGBq5F0iNGKQ/hVcQKBgQD3KWotQ2IbqFhMwW+m860CnxtBjTyUZZ4K5pqic0FLXG55mYKz1/uDwtwwurQeVW7VGCDNhN24jk/H4dqIcfHTlTDu8eNejUoXySy49sFeUKo4BHtiPd4yAsI2GIv2al4ksmMAV1ghXbGdfcFsQ3711xUX4OyBBsyyt3UlND5lDwKBgQDqG3gxij0reEHlwmH0yOFjWk4tuaJtISXHPHlfPTY9cnDosH1bbRgEyo3PCxIzdh3zOs0oJvAZTyAt0P7LNF8DRN7J7fyI3oll1amZ30ibh7A7hw2JoYO+dOnhT6h7o5wxMrw8H+6lj5abziSNIsZsvJh6wwj8J8ELjYocqho9fwKBgD/fC/k2eJv9HRR4yIm0XvlWdIy0GvueZwEaJsvkTPNUp5f0+7nODsk2CgDtvq44FbQr0A5MT5/p5uQYkYjBKWUsIMEe8Ur16DfNXSlPWxksb1Cal+gDZPA3lki0fzbmtf11u+/Soou80rGIVfvMVXriYikRjwyo3S0yC6vZnGYxAoGBAKIr60QuJhex07xsvlzKt0+S5CtKuBju6HOvEckG50cDuvGGKSCnXwcapceyPKaHgVHX/vx8lMCDjqAOciKkIdlq4QZzJQhPWFDCBR4BjhOnmE50TM11pITQCqA5BVa4zN9L7Redaz0nTcaas7lNSLVUpDAOYXADvffZ0b3vnAPTAoGADzenP6VQRb9qxY+2af7zlbfLHRk35xBaInnZyrcmeaXs/0MssCAqLTqA27xGraJ7uvjrPEchXK4STl+UD2IxtEoRamopn3ZRzB1xpBVjWST85NUbOY+aHJOTwfEMVHH3wsiUucxdLq63UFo1RGtpfb6yftTnXqtPxGEIbYPyylE=";
internal static string MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEu3hCLeQXcWmi+wXaaM0HSJkRxFb/lQl8GU69UiRmf0zI4Xh7/cPBXdm/CWS5SzzTRCQJh23/USxPuyB//wWHgkqUASj12B4mMdx+/KGFmgrAFCy4CBhE2+O4AaiKWuZ8Gpmv+NUseNhy/kyzdNrmqikffr1vM7q1emJ8Y9OihGIAB8toT6b9I/iL93yLUXNLe0ELIIJ1+mmr7j0GvAMZQKL2IrfJ4MCRqg0Ioj2Ql1ckrkmIjgMKZQ1ryzrzcllq5YeaOM8fM3gff9Ntn06N2fsbpZFnGzokNpZkBX8wsLwOHBLM25RxvMPWH9UwWBXkklNHe57PN9G7qtvMMOnPAgMBAAECggEAMeTNuhMDbwKfZOs+78Z2gStjTsM5wTYeIrAUbSVg//G3Gpc8RE32kJrpt259chTnxzjX3ubO+dqvX0U5F90onNZpbaHhrn/yHYO1xSrzF/waT96N/NpotUYDOc6J3RTysXTZl2yHO/EmC/v8neK8BZYQOeGdz48SAiaYxa1XpjZ0QAUX3rCjf9qjkTKux0TZTBk67PcIb+Gwqk4nRWhc0i3yXW4Xw8Z8UJeABgtsOZ16Nv95K7jA836sF+gf4chLGDl8J9Y7Ciz/FpJPksa6Ysoo6jMW9WkggGsNEOwTK6SfYWqIER+NozWG5F4jOlAmdc3zlteOdM3Z9kiYHdlsmQKBgQD78RpE3AEFIC6dgO5isbBeSRNZJUHOp/H49cJgwtk3DiDuN/hLh8Lw3priFiOSlioFRmv6VkQVRQJ38pCbXacc04d34joNy0zXVWFtaaZlureRz74tTbi9Dp1x123NIJ/i/jiJLBdrXfmkNaQpyzfsrIC1vrFpaA5RWKcooZrgzQKBgQDH5rUX9q6tcB/UE3zNfJsNE/yw1QFSAIzcKE3vxWifjbURdVJXpvNoXWkTivwxEbhBDpyAhtUngpN+Ac/3ZP88hY21v+AHmgq9/65z++Wbptg9JfPpGti7kA132D76OfaGca3C1kt1A4Kl+177P52Nx9uAWbANEw+02Dd147pFCwKBgAbzT9Y2e5C4opCVzf3LCSKQwYfkDzy0RWio3wPsXDG4og/wW1k6FZavjXZPRgv1OJOMrc3qM1ai4L6OYo7mtoWFEGeuRgu7YBNQt69dCsojrIzJPmXhjwcoMA/D8bOHAuIwQT8HiF3d6dUt5amBgbl1yNc6u4o85Kg52eK1EqDBAoGARmbZNpRZVpnbi8xFMvWEgemdIAYUjfXFpi/Hqv8iZrb4oypnkpkotoPXYtubEAkGlFr6AUX7Qgv5t/IZdS6ruXvruavW0baNu/aVUSHQ7q2nEHoSWfFrjTshkyiknWnWiej1Yl4oexB+bciG3gO8kFdn1d9AYoppCK7xcWJ/kpsCgYEA2se5A7Oa6JsWmpil+kRSyijoynEnC4IGVEIzboYcBxlyxfpHtwS2zOdXkhIpjd2cqg08BGFcSxot8CaxCOBcRJsI+N+3lok6VffaZDRjttr+NdY/qc7OCmVCx1lJlJ2+WL0Zitv1DV84WqUY2XpQOHvvcmGfuEXtyfkxD1rSJUE=";
internal static string QR_CODE_MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCER3xnjjYb4na9yf49wJIE/ykXuk9q4QKYJk/+LQuVUmf3HYUmVvngB2jwrMWr0x+Asg3XFyoctmZBDci3mgElQW6u1jNBUEUqbU+9oHT496D1g7KRVZZOWqaSZmFkPYf6Kr+uZgUtQEHeKiTuG3wIR2COSzuEsBvW8Q0RobHiCXXVmKpfpkB2cktwHzfu4sgTNrnvru5EDRFUMk72sMa5M9gasmY8XIVF711LWFreqVTKZPTuMTTIbZuVUd+vADWB7Y48IIEEsdIbbH8qwnTrEIvvWEJkhRYMpPvioLzqlepXZ8xNPD3Hu/SxHRRS+rQHiQvIpkqUK0JxOG+JpD8NAgMBAAECggEAczzrzjOARA6or3K3wQhwrVW1cOxon43i+rX13lNT0gR2ejwHcX04Nsl9zJ5XnvdQbIexsv6FO3pT3rypbfoGoXQ9fqcxA+dwOiP84hBVl0fzu6+98wsC5MPodYYntnI8cd6oGsDaJa/jMi64+Y6MIZI9NfmoolHiDwD1B7U8CNRAZR4XSTd22kmaF222cipgjpxrJozsJWSlwXsaw6ZEYsSraP76ZU1GiKZPKayLxQtTmHmqL/1SgVb2gBnW2FpTTdeanxjhnvE1Ikg28bfZPpA8c0jItjNpFvmyaf/3C2pKJBYKkAuyQSjMexS6anBX4G4LRfcDzrJzY12eHWrb6QKBgQC5iOg9JqxOmDCBN4I7hd3ax9bFPKQe7NO1Hs2cgyOCp3Ph/yK8/OIlGSBDHVlXPOpq80OwmOGU5AXJTBRpgDLC7gF9gphd9l+sIkHtQ5+mWld+jr7qFlW95y+H51PDk0nSg2GIkyID3t3G0NBooDM/XaXyndljBOQwMVpVBdqAWwKBgQC2hKwRCb2C6ZAssw8Cq5LWR2psFONbqAmA6aO9GgFKF0mBsyq0sstz/nE/XBURc+zOnYr72WFMMaoVkNPTxwqXNcHu4vbyepfBSWBDSJxndlMKXcld5+GZCyl9nUFLHGjYbNUsMgahaR5l9eNiMbHzKHdRNw7Trf2gLnvWlH/atwKBgHaP3pj1VbcD2js41ahj61obyktQbTC19rQPcyVJSC/+AjexaumKUJmUbOF2p9jvvH2L5v27NKyI6omwbHreyZF3tswV4HhrMMg3PBn61NLheHgPkEDW9QPd8KnQUd7xCIPWIUW9gEco7GBYoFW7ygP8PEfGR1zXi1qgrzEWBINxAoGBAIe3h6rzrzOVMVvLmbHGmt0zJXNQ5O7WuJpfIR4QJD1Pq50B+RN8j8Skwtj2Q8RCiyfoBdzX+32IwIxgsOKc8scVdiuIIVCU0Bst0KK3b3WPipf+vSlSr3H51tRNBqwvZ9bmtmyyljOX0r7GZFoz0bqZsH93jVLh4eImLneU3K1pAoGAMUCNCHIpMSd+d5ewR9VxXY1DjGHvIC98EdsjL0S7QcVrWb9mh6Br5G6zvlIJcMhIaQm3C1ETLaHG+K9XRrA+HcJo1ApeMT7MgBmIC+cG1aepZREDruNI3G8r4bDS6pHSDKk+Iu8shpEUurxZCzjBX2n5OeMJx+xDgYUq5H4Bn5I=";
///// <summary>
///// 正式:智慧记账公钥
///// </summary>
//internal static string APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4gZgdtCHtPNxMFYFLC1/8CnGKuMxph+E9gnC0VQczh0rdp8zNoBEKD0c6J77fhyIfUetzRmjQbE3kAs4L6Us1bhHzRaAKAP5hdAyMcb6XqET6WLxN/kA3jvPqteG2yXLnGtY+SxUGNmptluAC2AdvRECg4ui1sLNC/MWpsLzXDu5yIBMqnbHOig4cJOdCgVk+vEFi92niVAAdOfsbqMhT/nmWkFfFH2EbSxsN5+ihZ39VQJ1CTG2HBMUEvbjr0aHgn1rcMNyRAx2jM+XhoyZe/BIyTV2zI0xH0sc1d3jfmYn733/gmjZ01ikiG0eqBZJMEIJYBk/7M6h9dv+Ao61cQIDAQAB";
/// <summary>
/// APIGW_PUBLIC_KEY:网关公钥
/// 测试:智慧记账公钥
/// </summary>
//internal static string APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4gZgdtCHtPNxMFYFLC1/8CnGKuMxph+E9gnC0VQczh0rdp8zNoBEKD0c6J77fhyIfUetzRmjQbE3kAs4L6Us1bhHzRaAKAP5hdAyMcb6XqET6WLxN/kA3jvPqteG2yXLnGtY+SxUGNmptluAC2AdvRECg4ui1sLNC/MWpsLzXDu5yIBMqnbHOig4cJOdCgVk+vEFi92niVAAdOfsbqMhT/nmWkFfFH2EbSxsN5+ihZ39VQJ1CTG2HBMUEvbjr0aHgn1rcMNyRAx2jM+XhoyZe/BIyTV2zI0xH0sc1d3jfmYn733/gmjZ01ikiG0eqBZJMEIJYBk/7M6h9dv+Ao61cQIDAQAB";
internal static string APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSJrF8T/5rKB4NnwMjIxUer+ELf1PQXO2GSdZ/fvuQCclOR9tBlNWL4jFOftebeL+bvMVOJ+JHm/aSes1AN8YNIDGiFUpF6aDkSCaLynDdjK/mQTWhSNa2fO0GGO+ywOBTdYUjVjVtzJ48bbyG3NSylf1EdnBWnMpFa8qpXJXR4ELpVpMkPDC+93HBAlxEgUjhcIJlP5VdKIiudsmhE2T07qtpIQSuE5hntXP6X6GKJReCk+yek2QJITvIBq3cHPw8KDsHHCs7MaR81KI3onJRWyqFtTfVYTiKsd9EcYSxv+Gx5MOF8B/P4iJCD8uzx0FrqoB3k5OYGcz4tXs+h+9wIDAQAB";
internal static string QR_CODE_APIGW_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSJrF8T/5rKB4NnwMjIxUer+ELf1PQXO2GSdZ/fvuQCclOR9tBlNWL4jFOftebeL+bvMVOJ+JHm/aSes1AN8YNIDGiFUpF6aDkSCaLynDdjK/mQTWhSNa2fO0GGO+ywOBTdYUjVjVtzJ48bbyG3NSylf1EdnBWnMpFa8qpXJXR4ELpVpMkPDC+93HBAlxEgUjhcIJlP5VdKIiudsmhE2T07qtpIQSuE5hntXP6X6GKJReCk+yek2QJITvIBq3cHPw8KDsHHCs7MaR81KI3onJRWyqFtTfVYTiKsd9EcYSxv+Gx5MOF8B/P4iJCD8uzx0FrqoB3k5OYGcz4tXs+h+9wIDAQAB";
......
......@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2023.6300")]
[assembly: AssemblyFileVersion("5.4.2023.6300")]
[assembly: AssemblyVersion("5.4.2023.8210")]
[assembly: AssemblyFileVersion("5.4.2023.8210")]
......@@ -48,7 +48,10 @@ namespace Njzj.Bocoms.Openapis.Transforms
//if (log == null) return rtns;
result.BillId = result.biz_content.bill_id;
result.BizKvid = Guid.Parse(result.biz_content.cont_id);
if(Guid.TryParse(result.biz_content.cont_id, out var bizKvid))
{
result.BizKvid = bizKvid;
}
conn.Insert(result);
var resp = "{\"rsp_code\":\"0\",\"biz_state\":\"S\",\"rsp_msg\":\"核销处理成功\"}";
......
......@@ -69,6 +69,12 @@ namespace Com.Bocom.OpenApi
//internal string subOrgId;
[DataMember]
public string sub_org_id { get; set; }
/// <summary>
/// 账单编号
/// </summary>
[DataMember]
public string bill_id { get; set; }
/// <summary>
/// 核销日期 </summary>
//JAVA TO C# CONVERTER TODO TASK: Most Java annotations will not have direct .NET equivalent attributes:
......
......@@ -59,6 +59,7 @@ namespace Njzj.Bocoms.Openapis.Transforms
public class WriteOffResultResponseV2Test : RestfulExecution<WriteOffResultResponseV2>
{
public string BillId { get; set; }
public override object OnExecution(IRequest req, IResponse res)
{
DefaultBocomClient client = new DefaultBocomClient(Configs.APP_ID, Configs.MY_PRIVATE_KEY, Configs.APIGW_PUBLIC_KEY);
......@@ -70,6 +71,7 @@ namespace Njzj.Bocoms.Openapis.Transforms
request.SetServiceUrl(Configs.APIGW_URL_ADDRESS + Configs.WriteOffResultRequestV2);
WriteOffResultRequestV2.WriteOffResultRequestV2Biz bizContent = new WriteOffResultRequestV2.WriteOffResultRequestV2Biz();
bizContent.org_id = Configs.ORG_ID;
bizContent.bill_id = BillId;
//bizContent.subOrgId = Configs.SUB_ORG_ID;
//bizContent.writeOffDte = "2022-05-03";
//bizContent.writeOffNo = "2022050500004";
......
......@@ -31,19 +31,21 @@ namespace Njzj.Bocoms.Openapis
var connE = KiviiContext.GetOpenedDbConnection<WriteOffResultNotify>();
var query = connE.From<WriteOffResultNotify>();
query.Where(o => o.Status != int.MaxValue);
query.Where(o => o.BizKvid != Guid.Empty && o.Status != int.MaxValue);
var writeOffs = connE.Select(query);
if (writeOffs.IsNullOrEmpty())
{
TaskContext.Message = "暂无核销通知需处理!";
return true;
}
var bizKvids = writeOffs.ConvertAll(o => o.BizKvid);
var kvids = writeOffs.ConvertAll(o => o.Kvid).Distinct().ToList();
var bizKvids = writeOffs.ConvertAll(o => o.BizKvid).Distinct().ToList();
bizKvids.RemoveAll(o => o == Guid.Empty);
if (bizKvids.IsNullOrEmpty())
{
var updateWriteOffs=connE.From<WriteOffResultNotify>();
updateWriteOffs = updateWriteOffs.Update(o => o.Status);
updateWriteOffs = updateWriteOffs.Where(o => Sql.In(o.BizKvid, bizKvids));
updateWriteOffs = updateWriteOffs.Where(o => Sql.In(o.Kvid, kvids));
connE.UpdateOnly(new WriteOffResultNotify { Status = int.MaxValue }, updateWriteOffs);
TaskContext.Message = "暂无核销通知需处理!";
return true;
......@@ -55,7 +57,7 @@ namespace Njzj.Bocoms.Openapis
{
var updateWriteOffs = connE.From<WriteOffResultNotify>();
updateWriteOffs = updateWriteOffs.Update(o => o.Status);
updateWriteOffs = updateWriteOffs.Where(o => Sql.In(o.BizKvid, bizKvids));
updateWriteOffs = updateWriteOffs.Where(o => Sql.In(o.Kvid, kvids));
connE.UpdateOnly(new WriteOffResultNotify { Status = int.MaxValue }, updateWriteOffs);
TaskContext.Message = "暂无核销通知需处理!";
return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment