1订单价格统计数据接口修改 2拦截退回状态

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(),

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("'", "\\'");
+				var latest_cnt = RegexUtils.GetStringQuery(ref inputData, "latest_cnt")?.ParseToInt(3);
-                out_product_ids = string.Join("','", out_product_ids.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
+				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)

KJD_WebService/KJD_WebService.csproj

@@ -331,7 +331,11 @@
       <DependentUpon>Web.config</DependentUpon>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Include="FreeSql.Repository">
+      <Version>3.5.311</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs

@@ -71,10 +71,10 @@ namespace KJD_Web.Model.WxModel
         /// 拒收时间
         /// </summary>
         public DateTime? rejected_time { get; set; }
-        /// <summary>
+		/// <summary>
-        /// 拦截退回状态：0未处理，1已退回，2退回失败
+		/// 拦截退回状态：0未处理，1已退回，2退回失败，3已签收，不可拦截
-        /// </summary>
+		/// </summary>
-        public int? intercept_return_status { get; set; }
+		public int? intercept_return_status { get; set; }
         /// <summary>
         /// 拦截退回时间
         /// </summary>

KJD_WebService/Model/WxModel/oms_wei_order.cs

@@ -241,5 +241,6 @@ namespace KJD_Web.Model.WxModel
         /// 中转仓的状态 0未使用，1已创建，2创建失败(购买失败)，3已创建未有上游快递单号，4已创建有上游快递单号
         /// </summary>
         public decimal? transfer_warehouse_status { get; set; }
-    }
+		public int? postage_price { get; set; }
+	}
 }