diff --git a/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJD_WebService/BLL/WXXD/WXOrderManage.cs
index f4a10bc..6ee5e50 100644
--- a/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+++ b/KJD_WebService/BLL/WXXD/WXOrderManage.cs
@@ -168,6 +168,7 @@ namespace KJD_Web.BLL.WXXD
tel_number = row["tel_number"].ParseToNullableString(),
tel_number_ext_info = row["tel_number_ext_info"].ParseToNullableString(),
transfer_warehouse_status = row["transfer_warehouse_status"].ParseToNullableInt(),
+ postage_price = row["postage_price"].ParseToNullableInt(),
unionid = row["unionid"].ParseToNullableString(),
update_time = row["update_time"].ParseToInt(),
user_name = row["user_name"].ParseToNullableString(),
diff --git a/KJD_WebService/BLL/WXXD/WXProductManage.cs b/KJD_WebService/BLL/WXXD/WXProductManage.cs
index 11dc465..caa50ce 100644
--- a/KJD_WebService/BLL/WXXD/WXProductManage.cs
+++ b/KJD_WebService/BLL/WXXD/WXProductManage.cs
@@ -39,8 +39,14 @@ namespace KJD_Web.BLL.WXXD
if (!WXShopManage.GetTimeSign(sign))
return "{\"code\":500,\"msg\":\"校验失败\"}";
- var out_product_ids = RegexUtils.GetStringQuery(ref inputData, "out_product_ids")?.Replace("'", "\\'");
- out_product_ids = string.Join("','", out_product_ids.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
+ var latest_cnt = RegexUtils.GetStringQuery(ref inputData, "latest_cnt")?.ParseToInt(3);
+ if (latest_cnt < 1)
+ latest_cnt = 1;
+ if (latest_cnt > 10)
+ latest_cnt = 10;
+
+ var out_product_ids = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_product_ids"))?.Replace("'", "\\'");
+ out_product_ids = string.Join("','", out_product_ids.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
@@ -55,9 +61,9 @@ FROM (
WHERE oi.out_product_id IN ('" + out_product_ids + @"') AND oi.refund_status = 1 AND o.status > 20 AND o.gift_order_status = 0
) r
WHERE r.rn <= 3;
-";
+WHERE r.rn<=" + latest_cnt + ";";
- DataTable dt = mySql.ExecuteDataTable(sql);
+ DataTable dt = mySql.ExecuteDataTable(sql);
mySql.Close();
if (dt != null)
diff --git a/KJD_WebService/KJD_WebService.csproj b/KJD_WebService/KJD_WebService.csproj
index caa9b92..654cf08 100644
--- a/KJD_WebService/KJD_WebService.csproj
+++ b/KJD_WebService/KJD_WebService.csproj
@@ -331,7 +331,11 @@
Web.config
-
+
+
+ 3.5.311
+
+
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
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 a5fcfe8..4fa8e18 100644
--- a/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs
+++ b/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs
@@ -71,10 +71,10 @@ namespace KJD_Web.Model.WxModel
/// 拒收时间
///
public DateTime? rejected_time { get; set; }
- ///
- /// 拦截退回状态:0未处理,1已退回,2退回失败
- ///
- public int? intercept_return_status { get; set; }
+ ///
+ /// 拦截退回状态:0未处理,1已退回,2退回失败,3已签收,不可拦截
+ ///
+ public int? intercept_return_status { get; set; }
///
/// 拦截退回时间
///
diff --git a/KJD_WebService/Model/WxModel/oms_wei_order.cs b/KJD_WebService/Model/WxModel/oms_wei_order.cs
index 22afa3c..bf27306 100644
--- a/KJD_WebService/Model/WxModel/oms_wei_order.cs
+++ b/KJD_WebService/Model/WxModel/oms_wei_order.cs
@@ -241,5 +241,6 @@ namespace KJD_Web.Model.WxModel
/// 中转仓的状态 0未使用,1已创建,2创建失败(购买失败),3已创建未有上游快递单号,4已创建有上游快递单号
///
public decimal? transfer_warehouse_status { get; set; }
- }
+ public int? postage_price { get; set; }
+ }
}
\ No newline at end of file