diff --git a/web/djy.Service/Ams/AmsService.cs b/web/djy.Service/Ams/AmsService.cs index 42f672b..23aeaff 100644 --- a/web/djy.Service/Ams/AmsService.cs +++ b/web/djy.Service/Ams/AmsService.cs @@ -475,10 +475,10 @@ namespace djy.Service.Ams var data = rlt.GetValue("data").ToString(); JObject drlt = JObject.Parse(data); var result = drlt.GetValue("result").ToString(); - var errorInfo = drlt.GetValue("errorInfo").ToString(); + if (code == "F" || result == "false") { - + var errorInfo = drlt.GetValue("errorInfo").ToString(); AMS_MasterHistory history = new AMS_MasterHistory(); history.GID = Guid.NewGuid().ToString("N"); history.AM_ID = oid; diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs index 71069f5..1de6f83 100644 --- a/web/djy.Service/ISF/IsfService.cs +++ b/web/djy.Service/ISF/IsfService.cs @@ -288,28 +288,28 @@ namespace djy.Service.Isf if (msgType != "3") { - //if (msgType == "1" || msgType == "4") - //{ - // ///扣费接口 - // var getfinrs = fin.Expend(new CustFee - // { - // SENDUSERID = user.GID, - // LURURENID = user.GID, - // CtnrCount = 1, - // CtnrInfo = string.Empty, - // BSTYPE = 16, - // SENDTYPE = 0, - // BSNO = oid.ToString(), - // MBLNO = master.MBLNO.ToString(), - // } - // , 0); - // if (!getfinrs.Status) - // { - // req.Code = 201; - // req.Message = getfinrs.Message; - // return req; - // } - //} + if (msgType == "1" || msgType == "4") + { + ///扣费接口 + var getfinrs = fin.Expend(new CustFee + { + SENDUSERID = user.GID, + LURURENID = user.GID, + CtnrCount = 1, + CtnrInfo = string.Empty, + BSTYPE = 16, + SENDTYPE = 0, + BSNO = oid.ToString(), + MBLNO = master.MBLNO.ToString(), + } + , 0); + if (!getfinrs.Status) + { + req.Code = 201; + req.Message = getfinrs.Message; + return req; + } + } var portList = DbBus.Get(DbList.Common).Select().ToList(); var CodePortLoadList = DbBus.Get(DbList.Common).Select().ToList(); Info info = new Info(); @@ -445,9 +445,9 @@ namespace djy.Service.Isf var data = rlt.GetValue("data").ToString(); JObject drlt = JObject.Parse(data); var result = drlt.GetValue("code").ToString(); - var errorInfo = drlt.GetValue("msg").ToString(); + if (result!="1") { - + var errorInfo = drlt.GetValue("msg").ToString(); history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = oid; history.SendTime = DateTime.Now; diff --git a/web/djy.WebApi/Controllers/AMS/AmsController.cs b/web/djy.WebApi/Controllers/AMS/AmsController.cs index 6183d2a..df00f06 100644 --- a/web/djy.WebApi/Controllers/AMS/AmsController.cs +++ b/web/djy.WebApi/Controllers/AMS/AmsController.cs @@ -22,6 +22,7 @@ namespace djy_AmsApi.Controllers.AMS { IAmsService ser = IOC.AddServer(); + #region 查询接口 [HttpGet("Load")] public object Load([FromQuery] AMSQuery request) @@ -128,8 +129,6 @@ namespace djy_AmsApi.Controllers.AMS } #endregion - - #region pdf导出 [HttpGet("ExportPDF")] public IActionResult ExportPDF(string ids) diff --git a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index a3d1b1e..33ece09 100644 --- a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\bin\Release\net5.0\publish\ - True|2022-07-05T03:23:47.7031600Z; + True|2022-07-07T03:23:54.2426892Z;True|2022-07-05T16:20:17.0177653+08:00;True|2022-07-05T16:19:13.8760086+08:00;True|2022-07-05T11:23:47.7031600+08:00; \ No newline at end of file diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 6ce8314..a1d5537 100644 --- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>F:\DJY.AMS\web\djy_IsfApi\bin\Release\net5.0\publish\ - True|2022-07-04T09:29:37.9437422Z;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; + <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\ + True|2022-07-07T03:27:16.6078315Z;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; \ No newline at end of file diff --git a/web/djy_IsfApi/djy_IsfApi.csproj.user b/web/djy_IsfApi/djy_IsfApi.csproj.user index 0c0d867..8cba453 100644 --- a/web/djy_IsfApi/djy_IsfApi.csproj.user +++ b/web/djy_IsfApi/djy_IsfApi.csproj.user @@ -1,7 +1,7 @@  - C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile.pubxml + C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\Properties\PublishProfiles\FolderProfile1.pubxml MvcControllerEmptyScaffolder root/Common/MVC/Controller