Skip to content

N
Njzj.Biz.Bocoms.Openapis.V4.5
Commit 6180ebee by 陶然
Options

优化

parent 1bfa00c2
Showing with 134 additions and 13 deletions
Extension.cs
...@@ -27,7 +27,7 @@ namespace Com.Bocom.OpenApi ...@@ -27,7 +27,7 @@ namespace Com.Bocom.OpenApi
err = string.Empty; err = string.Empty;
return null; return null;
} }
DefaultBocomClient client = new DefaultBocomClient(Configs.APP_ID, Configs.MY_PRIVATE_KEY, Configs.APIGW_PUBLIC_KEY, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES); DefaultBocomClient client = new DefaultBocomClient(Configs.appIdZhjz, Configs.priKeyZhjz, Configs.pubKeyZhjz, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES);
/** /**
* 测试环境可以忽略SSL证书告警，生产环境不可忽略 * 测试环境可以忽略SSL证书告警，生产环境不可忽略
*/ */
...@@ -36,7 +36,7 @@ namespace Com.Bocom.OpenApi ...@@ -36,7 +36,7 @@ namespace Com.Bocom.OpenApi
var bizKvid = settlement.Kvid.ToString(); var bizKvid = settlement.Kvid.ToString();
var bizId = settlement.BizId; var bizId = settlement.BizId;
var request = new AddContractOrderRequestV2(); var request = new AddContractOrderRequestV2();
request.SetServiceUrl(Configs.APIGW_URL_ADDRESS + Configs.AddContractOrderRequestV2); request.SetServiceUrl(Configs.basicUrlZhjz + Configs.AddContractOrderRequestV2);
var bizContent = new AddContractOrderRequestV2.AddContractOrderRequestV2Biz(); var bizContent = new AddContractOrderRequestV2.AddContractOrderRequestV2Biz();
bizContent.org_id = Configs.ORG_ID; bizContent.org_id = Configs.ORG_ID;
...@@ -89,13 +89,13 @@ namespace Com.Bocom.OpenApi ...@@ -89,13 +89,13 @@ namespace Com.Bocom.OpenApi
} }
var billId = settlement.Metadata["BocomBillId"]; var billId = settlement.Metadata["BocomBillId"];
//Console.WriteLine($"---------------BocomBillId:{billId}-------------------"); //Console.WriteLine($"---------------BocomBillId:{billId}-------------------");
DefaultBocomClient client = new DefaultBocomClient(Configs.APP_ID, Configs.MY_PRIVATE_KEY, Configs.APIGW_PUBLIC_KEY, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES); DefaultBocomClient client = new DefaultBocomClient(Configs.appIdZhjz, Configs.priKeyZhjz, Configs.pubKeyZhjz, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES);
/** /**
* 测试环境可以忽略SSL证书告警，生产环境不可忽略 * 测试环境可以忽略SSL证书告警，生产环境不可忽略
*/ */
client.IgnoreSslHostnameVerifier(); client.IgnoreSslHostnameVerifier();
var request = new DelContractOrderRequestV1(); var request = new DelContractOrderRequestV1();
request.SetServiceUrl(Configs.APIGW_URL_ADDRESS + Configs.DelContractOrderRequestV1); request.SetServiceUrl(Configs.basicUrlZhjz + Configs.DelContractOrderRequestV1);
var bizContent = new DelContractOrderRequestV1.DelContractOrderRequestV1Biz(); var bizContent = new DelContractOrderRequestV1.DelContractOrderRequestV1Biz();
bizContent.org_id = Configs.ORG_ID; bizContent.org_id = Configs.ORG_ID;
...@@ -211,14 +211,14 @@ namespace Com.Bocom.OpenApi ...@@ -211,14 +211,14 @@ namespace Com.Bocom.OpenApi
//rtnTests.rsp_body.pay_mer_tran_no = uniqueCode; //rtnTests.rsp_body.pay_mer_tran_no = uniqueCode;
//return rtnTests; //return rtnTests;
DefaultBocomClient client = new DefaultBocomClient(Configs.QR_CODE_APP_ID, Configs.QR_CODE_MY_PRIVATE_KEY, Configs.QR_CODE_APIGW_PUBLIC_KEY, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES); DefaultBocomClient client = new DefaultBocomClient(Configs.appIdQrCode, Configs.priKeyQrCode, Configs.pubKeyQrCode, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES);
/** /**
* 测试环境可以忽略SSL证书告警，生产环境不可忽略 * 测试环境可以忽略SSL证书告警，生产环境不可忽略
*/ */
client.IgnoreSslHostnameVerifier(); client.IgnoreSslHostnameVerifier();
var request = new MPNG210001RequestV1(); var request = new MPNG210001RequestV1();
request.SetServiceUrl(Configs.QR_CODE_APIGW_URL_ADDRESS + Configs.MPNG210001RequestV1); request.SetServiceUrl(Configs.basicUrlQrCode + Configs.MPNG210001RequestV1);
var bizContent = new MPNG210001RequestV1.MPNG210001RequestV1Biz(); var bizContent = new MPNG210001RequestV1.MPNG210001RequestV1Biz();
bizContent.req_head = new MPNG210001RequestV1.MPNG210001RequestV1Biz.ReqHead(); bizContent.req_head = new MPNG210001RequestV1.MPNG210001RequestV1Biz.ReqHead();
bizContent.req_head.trans_time = DateTime.Now.ToString("yyyyMMddHHmmss"); bizContent.req_head.trans_time = DateTime.Now.ToString("yyyyMMddHHmmss");
...@@ -254,14 +254,14 @@ namespace Com.Bocom.OpenApi ...@@ -254,14 +254,14 @@ namespace Com.Bocom.OpenApi
public static MPNG020702ResponseV1 GetReceiveCodeOrder(string payMerTranNo) public static MPNG020702ResponseV1 GetReceiveCodeOrder(string payMerTranNo)
{ {
payMerTranNo.ThrowIfNullOrEmpty("缺少订单号信息"); payMerTranNo.ThrowIfNullOrEmpty("缺少订单号信息");
DefaultBocomClient client = new DefaultBocomClient(Configs.QR_CODE_APP_ID, Configs.QR_CODE_MY_PRIVATE_KEY, Configs.QR_CODE_APIGW_PUBLIC_KEY, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES); DefaultBocomClient client = new DefaultBocomClient(Configs.appIdQrCode, Configs.priKeyQrCode, Configs.pubKeyQrCode, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES);
/** /**
* 测试环境可以忽略SSL证书告警，生产环境不可忽略 * 测试环境可以忽略SSL证书告警，生产环境不可忽略
*/ */
client.IgnoreSslHostnameVerifier(); client.IgnoreSslHostnameVerifier();
var request = new MPNG020702RequestV1(); var request = new MPNG020702RequestV1();
request.SetServiceUrl(Configs.QR_CODE_APIGW_URL_ADDRESS + Configs.MPNG020702RequestV1); request.SetServiceUrl(Configs.basicUrlQrCode + Configs.MPNG020702RequestV1);
var bizContent = new MPNG020702RequestV1.MPNG020702RequestV1Biz(); var bizContent = new MPNG020702RequestV1.MPNG020702RequestV1Biz();
bizContent.req_head = new MPNG020702RequestV1.MPNG020702RequestV1Biz.ReqHead(); bizContent.req_head = new MPNG020702RequestV1.MPNG020702RequestV1Biz.ReqHead();
bizContent.req_head.trans_time = DateTime.Now.ToString("yyyyMMddHHmmss"); bizContent.req_head.trans_time = DateTime.Now.ToString("yyyyMMddHHmmss");
......
Properties/AssemblyInfo.cs
...@@ -33,5 +33,5 @@ using System.Runtime.InteropServices; ...@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2023.8210")] [assembly: AssemblyVersion("5.4.2023.8290")]
[assembly: AssemblyFileVersion("5.4.2023.8210")] [assembly: AssemblyFileVersion("5.4.2023.8290")]
RestfulWriteOff.cs
...@@ -8,6 +8,7 @@ using System.Linq; ...@@ -8,6 +8,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Kivii.Linq; using Kivii.Linq;
using Kivii.Text;
namespace Njzj.Bocoms.Openapis.Transforms namespace Njzj.Bocoms.Openapis.Transforms
{ {
...@@ -40,7 +41,7 @@ namespace Njzj.Bocoms.Openapis.Transforms ...@@ -40,7 +41,7 @@ namespace Njzj.Bocoms.Openapis.Transforms
Console.WriteLine("------------------------------------Start-----------------------------------------"); Console.WriteLine("------------------------------------Start-----------------------------------------");
try try
{ {
var result = ApiUtils.ParseCommunicationJsonWithBocomSign(dic, "utf-8", Configs.MY_PRIVATE_KEY, Configs.APIGW_PUBLIC_KEY); var result = ApiUtils.ParseCommunicationJsonWithBocomSign(dic, "utf-8", Configs.priKeyZhjz, Configs.pubKeyZhjz);
var conn = KiviiContext.GetOpenedDbConnection<WriteOffResultNotify>(); var conn = KiviiContext.GetOpenedDbConnection<WriteOffResultNotify>();
conn.InitEntityType<EntityLog<WriteOffResultNotify>>(); conn.InitEntityType<EntityLog<WriteOffResultNotify>>();
...@@ -48,7 +49,7 @@ namespace Njzj.Bocoms.Openapis.Transforms ...@@ -48,7 +49,7 @@ namespace Njzj.Bocoms.Openapis.Transforms
//if (log == null) return rtns; //if (log == null) return rtns;
result.BillId = result.biz_content.bill_id; result.BillId = result.biz_content.bill_id;
if(Guid.TryParse(result.biz_content.cont_id, out var bizKvid)) if (Guid.TryParse(result.biz_content.cont_id, out var bizKvid))
{ {
result.BizKvid = bizKvid; result.BizKvid = bizKvid;
} }
...@@ -57,7 +58,7 @@ namespace Njzj.Bocoms.Openapis.Transforms ...@@ -57,7 +58,7 @@ namespace Njzj.Bocoms.Openapis.Transforms
var resp = "{\"rsp_code\":\"0\",\"biz_state\":\"S\",\"rsp_msg\":\"核销处理成功\"}"; var resp = "{\"rsp_code\":\"0\",\"biz_state\":\"S\",\"rsp_msg\":\"核销处理成功\"}";
//var rspBizContent = "{\"rsp_head\":{\"response_msg\":\"非白名单客户\",\"response_code\":\"CIPP0004MT0017\"},\"rsp_body\":{\"context_no\":\"P21201026566300000019\",\"account_exist_flag\":\"EF00\"}"; //var rspBizContent = "{\"rsp_head\":{\"response_msg\":\"非白名单客户\",\"response_code\":\"CIPP0004MT0017\"},\"rsp_body\":{\"context_no\":\"P21201026566300000019\",\"account_exist_flag\":\"EF00\"}";
var rsp = ApiUtils.SignRspBizContent(resp, result.encrypt_key, Configs.MY_PRIVATE_KEY); var rsp = ApiUtils.SignRspBizContent(resp, result.encrypt_key, Configs.priKeyZhjz);
rtns.Results.Add(result); rtns.Results.Add(result);
return rsp; return rsp;
} }
...@@ -77,6 +78,121 @@ namespace Njzj.Bocoms.Openapis.Transforms ...@@ -77,6 +78,121 @@ namespace Njzj.Bocoms.Openapis.Transforms
} }
} }
[RequiresAnyRole(SystemRoles.Everyone)]
public class WriteOffResultResponseV2Request : RestfulExecution<WriteOffResultResponseV2>
{
public string BillId { get; set; }
public string WriteOffNo { get; set; }
public string WriteOffDate { get; set; }
public override object OnExecution(IRequest req, IResponse res)
{
//BillId.ThrowIfNullOrEmpty("请传入订单号");
DefaultBocomClient client = new DefaultBocomClient(Configs.appIdZhjz, Configs.priKeyZhjz, Configs.pubKeyZhjz);
//测试环境可以忽略SSL证书告警，生产环境不可忽略
//client.IgnoreSslHostnameVerifier();
WriteOffResultRequestV2 request = new WriteOffResultRequestV2();
request.SetServiceUrl(Configs.basicUrlZhjz + 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.write_off_dte = WriteOffDate;
bizContent.write_off_no = WriteOffNo;
bizContent.pageablerequest_pagenum = "1";
bizContent.pageablerequest_pagesize = "10";
request.SetBizContent(bizContent);
var response = client.Execute(request, Guid.NewGuid().ToString().Replace("-", ""));
var rtns = new RestfulExecutionResponse<WriteOffResultResponseV2>();
rtns.Results = new List<WriteOffResultResponseV2>();
if (response.IsSuccess())
{
var resp = response as WriteOffResultResponseV2;
rtns.Results.Add(resp);
}
else
{
throw new Exception($"ReturnCode:{response.GetRspCode()}{Environment.NewLine}ReturnMsg:{response.GetRspMsg()}");
}
return rtns;
}
}
[RequiresAnyRole(SystemRoles.Everyone)]
public class UnWriteOffResponseV1Request : RestfulExecution<UnWriteOffResponseV1>
{
public string BillId { get; set; }
public override object OnExecution(IRequest req, IResponse res)
{
BillId.ThrowIfNullOrEmpty("请传入订单号");
DefaultBocomClient client = new DefaultBocomClient(Configs.appIdZhjz, Configs.priKeyZhjz, Configs.pubKeyZhjz, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES);
//测试环境可以忽略SSL证书告警，生产环境不可忽略
//client.IgnoreSslHostnameVerifier();
var request = new UnWriteOffRequestV1();
request.SetServiceUrl(Configs.basicUrlZhjz + Configs.DelContractOrderRequestV1);
var bizContent = new UnWriteOffRequestV1.UnWriteOffRequestV1Biz();
bizContent.org_id = Configs.ORG_ID;
bizContent.bill_id = BillId;
request.SetBizContent(bizContent);
var response = client.Execute(request, Guid.NewGuid().ToString().Replace("-", ""));
var rtns = new RestfulExecutionResponse<UnWriteOffResponseV1>();
rtns.Results = new List<UnWriteOffResponseV1>();
if (response.IsSuccess())
{
var resp = response as UnWriteOffResponseV1;
rtns.Results.Add(resp);
}
else
{
throw new Exception($"ReturnCode:{response.GetRspCode()}{Environment.NewLine}ReturnMsg:{response.GetRspMsg()}");
}
return rtns;
}
}
[RequiresAnyRole(SystemRoles.Everyone)]
public class QueryContractOrderResponseV2Request : RestfulExecution<QueryContractOrderResponseV2>
{
public string BillId { get; set; }
public override object OnExecution(IRequest req, IResponse res)
{
BillId.ThrowIfNullOrEmpty("请传入订单号");
DefaultBocomClient client = new DefaultBocomClient(Configs.appIdZhjz, Configs.priKeyZhjz, Configs.pubKeyZhjz, BocomConstants.ENCRYPT_TYPE_RSA_AND_AES);
/**
* 测试环境可以忽略SSL证书告警，生产环境不可忽略
*/
client.IgnoreSslHostnameVerifier();
var request = new QueryContractOrderRequestV2();
request.SetServiceUrl(Configs.basicUrlZhjz + Configs.QueryContractOrderRequestV2);
var bizContent = new QueryContractOrderRequestV2.QueryContractOrderRequestV2Biz();
bizContent.setOrgId(Configs.ORG_ID);
bizContent.setBillId(BillId);
request.SetBizContent(bizContent);
var json = JsonSerializer.SerializeToString(request);
var response = client.Execute(request, Guid.NewGuid().ToString().Replace("-", ""));
var rtns = new RestfulExecutionResponse<QueryContractOrderResponseV2>();
rtns.Results = new List<QueryContractOrderResponseV2>();
if (response.IsSuccess())
{
var resp = response as QueryContractOrderResponseV2;
rtns.Results.Add(resp);
}
else
{
throw new Exception($"ReturnCode:{response.GetRspCode()}{Environment.NewLine}ReturnMsg:{response.GetRspMsg()}");
}
return rtns;
}
}
[RequiresAnyRole(SystemRoles.Everyone)] [RequiresAnyRole(SystemRoles.Everyone)]
public class WriteOffResultNotifyQuery : RestfulQuery<WriteOffResultNotify> public class WriteOffResultNotifyQuery : RestfulQuery<WriteOffResultNotify>
......
WriteOffJob.cs
...@@ -95,6 +95,8 @@ namespace Njzj.Bocoms.Openapis ...@@ -95,6 +95,8 @@ namespace Njzj.Bocoms.Openapis
continue; continue;
} }
var serialNumber = split[1]; var serialNumber = split[1];
var number = split[2].Substring(split[2].Length - 1, 1);
serialNumber = $"{serialNumber}{number}";
if (serialNumber.IsNullOrEmpty()) if (serialNumber.IsNullOrEmpty())
{ {
TaskContext.Message = $"Error:10003,[{item.BillId}]vch_no截取的流水号是空!"; TaskContext.Message = $"Error:10003,[{item.BillId}]vch_no截取的流水号是空!";
...@@ -160,7 +162,10 @@ namespace Njzj.Bocoms.Openapis ...@@ -160,7 +162,10 @@ namespace Njzj.Bocoms.Openapis
TaskContext.Message = $"Error:10005,[{writeOff.BillId}]vch_no号格式不符合Split规则!"; TaskContext.Message = $"Error:10005,[{writeOff.BillId}]vch_no号格式不符合Split规则!";
continue; continue;
} }
//var serialNumber = splitSerial[1];
var serialNumber = splitSerial[1]; var serialNumber = splitSerial[1];
var number = splitSerial[2].Substring(splitSerial[2].Length - 1, 1);
serialNumber = $"{serialNumber}{number}";
if (serialNumber.IsNullOrEmpty()) if (serialNumber.IsNullOrEmpty())
{ {
TaskContext.Message = $"Error:10006,[{writeOff.BillId}]vch_no截取的流水号是空!"; TaskContext.Message = $"Error:10006,[{writeOff.BillId}]vch_no截取的流水号是空!";
......
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