中转仓订单包裹拦截退回新字段
This commit is contained in:
1 parent
fe5f066590
commit
be8c629c25
3 files changed
+22
-4
No files matched your search
@@ -792,6 +792,9 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
has_reject = row["has_reject"].ParseToInt(),
|
has_reject = row["has_reject"].ParseToInt(),
|
||||||
blocked_arrival_time = row["blocked_arrival_time"].ParseToNullableString().ParseToDateTimeNullable(),
|
blocked_arrival_time = row["blocked_arrival_time"].ParseToNullableString().ParseToDateTimeNullable(),
|
||||||
rejected_time = row["rejected_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;
|
return oms_wei_external_procurement_log_list;
|
||||||
@@ -2167,6 +2170,9 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public string GetWxTaskStatus(string inputData, bool isDetail = false)
|
public string GetWxTaskStatus(string inputData, bool isDetail = false)
|
||||||
{
|
{
|
||||||
|
// 暂时先拿掉
|
||||||
|
//return "{\"code\":19999,\"msg\":\"参数为空\"}";
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(inputData))
|
if (string.IsNullOrEmpty(inputData))
|
||||||
return "{\"code\":19999,\"msg\":\"参数为空\"}";
|
return "{\"code\":19999,\"msg\":\"参数为空\"}";
|
||||||
|
|
||||||
@@ -2191,8 +2197,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
endTime = TimeUtils.StampMillisecondsToDateTime(end_Time.ParseToLong());
|
endTime = TimeUtils.StampMillisecondsToDateTime(end_Time.ParseToLong());
|
||||||
if (endTime <= startTime)
|
if (endTime <= startTime)
|
||||||
throw new ArgumentException("结束时间必须大于开始时间");
|
throw new ArgumentException("结束时间必须大于开始时间");
|
||||||
//if (endTime > startTime.AddDays(10))
|
if (endTime > startTime.AddDays(10))
|
||||||
// throw new ArgumentException("时间范围不能超过10天");
|
throw new ArgumentException("时间范围不能超过10天");
|
||||||
int startTimestamp = TimeUtils.DateTimeToTimestampSeconds(startTime);
|
int startTimestamp = TimeUtils.DateTimeToTimestampSeconds(startTime);
|
||||||
int endTimestamp = TimeUtils.DateTimeToTimestampSeconds(endTime);
|
int endTimestamp = TimeUtils.DateTimeToTimestampSeconds(endTime);
|
||||||
|
|
||||||
|
|||||||
@@ -71,5 +71,17 @@ namespace KJD_Web.Model.WxModel
|
|||||||
/// 拒收时间
|
/// 拒收时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime? rejected_time { get; set; }
|
public DateTime? rejected_time { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 拦截退回状态:0未处理,1已退回,2退回失败
|
||||||
|
/// </summary>
|
||||||
|
public int? intercept_return_status { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 拦截退回时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? intercept_return_time { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 拦截退回操作信息/回调信息
|
||||||
|
/// </summary>
|
||||||
|
public string intercept_return_info { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,8 +5,8 @@
|
|||||||
-->
|
-->
|
||||||
<configuration>
|
<configuration>
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<!--<add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;"/>-->
|
<add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;"/>
|
||||||
<add name="ConnKJD" connectionString="Server=localhost;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>
|
<!--<add name="ConnKJD" connectionString="Server=localhost;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>-->
|
||||||
<add name="ConnKJDBAK" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-9s7x16mt.sql.tencentcdb.com';Port=24049;User Id='kjdbak';Password='Temukjd0126';Charset=utf8mb4;"/>
|
<add name="ConnKJDBAK" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-9s7x16mt.sql.tencentcdb.com';Port=24049;User Id='kjdbak';Password='Temukjd0126';Charset=utf8mb4;"/>
|
||||||
<add name="UpdateVersion" connectionString="99999"/>
|
<add name="UpdateVersion" connectionString="99999"/>
|
||||||
<add name="UpdateFileDir" connectionString="C:\inetpub\wwwroot\kjd_update"/>
|
<add name="UpdateFileDir" connectionString="C:\inetpub\wwwroot\kjd_update"/>
|
||||||
|
|||||||
Reference in new issue
Block a user