diff --git a/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJD_WebService/BLL/WXXD/WXOrderManage.cs index 03d54cc..c0eaa74 100644 --- a/KJD_WebService/BLL/WXXD/WXOrderManage.cs +++ b/KJD_WebService/BLL/WXXD/WXOrderManage.cs @@ -792,6 +792,9 @@ namespace KJD_Web.BLL.WXXD has_reject = row["has_reject"].ParseToInt(), blocked_arrival_time = row["blocked_arrival_time"].ParseToNullableString().ParseToDateTimeNullable(), rejected_time = row["rejected_time"].ParseToNullableString().ParseToDateTimeNullable(), + intercept_return_info = row["intercept_return_info"].ParseToNullableString(), + intercept_return_status = row["intercept_return_status"].ParseToNullableInt(), + intercept_return_time = row["intercept_return_status"].ParseToNullableString().ParseToDateTimeNullable(), }); } return oms_wei_external_procurement_log_list; @@ -2167,6 +2170,9 @@ namespace KJD_Web.BLL.WXXD /// public string GetWxTaskStatus(string inputData, bool isDetail = false) { + // 暂时先拿掉 + //return "{\"code\":19999,\"msg\":\"参数为空\"}"; + if (string.IsNullOrEmpty(inputData)) return "{\"code\":19999,\"msg\":\"参数为空\"}"; @@ -2191,8 +2197,8 @@ namespace KJD_Web.BLL.WXXD endTime = TimeUtils.StampMillisecondsToDateTime(end_Time.ParseToLong()); if (endTime <= startTime) throw new ArgumentException("结束时间必须大于开始时间"); - //if (endTime > startTime.AddDays(10)) - // throw new ArgumentException("时间范围不能超过10天"); + if (endTime > startTime.AddDays(10)) + throw new ArgumentException("时间范围不能超过10天"); int startTimestamp = TimeUtils.DateTimeToTimestampSeconds(startTime); int endTimestamp = TimeUtils.DateTimeToTimestampSeconds(endTime); diff --git a/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs b/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs index e8cbbd6..a5fcfe8 100644 --- a/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs +++ b/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs @@ -71,5 +71,17 @@ namespace KJD_Web.Model.WxModel /// 拒收时间 /// public DateTime? rejected_time { get; set; } + /// + /// 拦截退回状态:0未处理,1已退回,2退回失败 + /// + public int? intercept_return_status { get; set; } + /// + /// 拦截退回时间 + /// + public DateTime? intercept_return_time { get; set; } + /// + /// 拦截退回操作信息/回调信息 + /// + public string intercept_return_info { get; set; } } } \ No newline at end of file diff --git a/KJD_WebService/Web.config b/KJD_WebService/Web.config index 5580f4b..0dbffb7 100644 --- a/KJD_WebService/Web.config +++ b/KJD_WebService/Web.config @@ -5,8 +5,8 @@ --> - - + +