diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 9c68a7d..6150369 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -31,7 +31,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1261;
+ public static int VersionCount = 1262;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
diff --git a/AllBase/LogSave.cs b/AllBase/LogSave.cs
index 22c70d4..98924dc 100644
--- a/AllBase/LogSave.cs
+++ b/AllBase/LogSave.cs
@@ -4,6 +4,7 @@
* 2015-3-13
*/
+using NaiBa.Util;
using System;
using System.Collections.Generic;
using System.IO;
@@ -23,7 +24,7 @@ namespace AllBase
///
/// 日志队列
///
- private static List Logs = new List();
+ private static ConcurrentList Logs = new ConcurrentList();
///
/// 准备写入文件
diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
index c4bcb62..26e8a33 100644
--- a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+++ b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
@@ -69,6 +69,12 @@ namespace KJD_Web.BLL.WXXD
}
else
{
+ //tinyint(1)中存超过两个值，只返回true或false，无法直接取值解决办法
+ //解决方法：
+ //1.强制修改mapResult中的映射，将po属性的类型由Boolean改为Byte
+ //2.查询 tinyint(1) 的sql 字段时，转为(status + 0) as status
+ //3.避免使用 tinyint(1) 作为字段的数据类型
+
sql = "SELECT o.*,(out_shipped+0) as out_shipped_int FROM erp.oms_wei_order o WHERE 1=1";
//where子句
@@ -94,71 +100,71 @@ namespace KJD_Web.BLL.WXXD
oms_wei_order order = new oms_wei_order
{
id = row["id"].ParseToLong(),
- aftersale_detail = row["aftersale_detail"].ParseToString(),
+ aftersale_detail = row["aftersale_detail"].ParseToNullableString(),
audit_status = row["audit_status"].ParseToNullableInt(),
- audit_time = row["audit_time"].ParseToString().ParseToDateTime(),
- city_name = row["city_name"].ParseToString(),
+ audit_time = row["audit_time"].ParseToNullableString().ParseToDateTime(),
+ city_name = row["city_name"].ParseToNullableString(),
colour_flag = row["colour_flag"].ParseToNullableInt(),
- colour_flag_update_time = row["colour_flag_update_time"].ParseToString().ParseToDateTime(),
+ colour_flag_update_time = row["colour_flag_update_time"].ParseToNullableString().ParseToDateTime(),
commission_amount = row["commission_amount"].ParseToNullableInt(),
- county_name = row["county_name"].ParseToString(),
+ county_name = row["county_name"].ParseToNullableString(),
create_time = row["create_time"].ParseToInt(),
delivery_deadline = row["delivery_deadline"].ParseToNullableInt(),
- delivery_product_info = row["delivery_product_info"].ParseToString(),
+ delivery_product_info = row["delivery_product_info"].ParseToNullableString(),
delivery_time = row["delivery_time"].ParseToNullableInt(),
- detail_info = row["detail_info"].ParseToString(),
+ detail_info = row["detail_info"].ParseToNullableString(),
discounted_price = row["discounted_price"].ParseToNullableInt(),
- erp_send_code = row["erp_send_code"].ParseToString(),
- erp_send_company = row["erp_send_company"].ParseToString(),
+ erp_send_code = row["erp_send_code"].ParseToNullableString(),
+ erp_send_company = row["erp_send_company"].ParseToNullableString(),
erp_send_status = row["erp_send_status"].ParseToNullableInt(),
- erp_send_time = row["erp_send_time"].ParseToString().ParseToDateTime(),
- ewaybill_order_code = row["ewaybill_order_code"].ParseToString(),
+ erp_send_time = row["erp_send_time"].ParseToNullableString().ParseToDateTime(),
+ ewaybill_order_code = row["ewaybill_order_code"].ParseToNullableString(),
external_gift = row["external_gift"].ParseToNullableInt(),
- ext_info = row["ext_info"].ParseToString(),
+ ext_info = row["ext_info"].ParseToNullableString(),
freight = row["freight"].ParseToNullableInt(),
freight_insurance_amount = row["freight_insurance_amount"].ParseToNullableInt(),
gift_order_status = row["gift_order_status"].ParseToNullableInt(),
- hash_code = row["hash_code"].ParseToString(),
+ hash_code = row["hash_code"].ParseToNullableString(),
has_freight_insurance = row["has_freight_insurance"].ParseToNullableInt(),
- house_number = row["house_number"].ParseToString(),
+ house_number = row["house_number"].ParseToNullableString(),
is_express_no_used = row["is_express_no_used"].ParseToNullableInt(),
is_shipment_optimized = row["is_shipment_optimized"].ParseToNullableInt(),
merchant_id = row["merchant_id"].ParseToLong(),
- openid = row["openid"].ParseToString(),
- order_id = row["order_id"].ParseToString(),
+ openid = row["openid"].ParseToNullableString(),
+ order_id = row["order_id"].ParseToNullableString(),
order_price = row["order_price"].ParseToNullableInt(),
- out_account = row["out_account"].ParseToString(),
- out_after_sale_status = row["out_after_sale_status"].ParseToString(),
+ out_account = row["out_account"].ParseToNullableString(),
+ out_after_sale_status = row["out_after_sale_status"].ParseToNullableString(),
out_amount = row["out_amount"].ParseToNullableInt(),
- out_express_company = row["out_express_company"].ParseToString(),
- out_express_no = row["out_express_no"].ParseToString(),
- out_order_no = row["out_order_no"].ParseToString(),
+ out_express_company = row["out_express_company"].ParseToNullableString(),
+ out_express_no = row["out_express_no"].ParseToNullableString(),
+ out_order_no = row["out_order_no"].ParseToNullableString(),
out_shipped = row["out_shipped_int"].ParseToNullableInt(),
- pay_info = row["pay_info"].ParseToString(),
- postal_code = row["postal_code"].ParseToString(),
+ pay_info = row["pay_info"].ParseToNullableString(),
+ postal_code = row["postal_code"].ParseToNullableString(),
predict_commission_fee = row["predict_commission_fee"].ParseToNullableInt(),
product_price = row["product_price"].ParseToNullableInt(),
profit = row["profit"].ParseToNullableInt(),
- province_name = row["province_name"].ParseToString(),
+ province_name = row["province_name"].ParseToNullableString(),
purchase_price = row["purchase_price"].ParseToNullableInt(),
purchase_status = row["purchase_status"].ParseToNullableInt(),
purchase_time = row["purchase_time"].ParseToNullableInt(),
- settle_info = row["settle_info"].ParseToString(),
+ settle_info = row["settle_info"].ParseToNullableString(),
ship_done_time = row["ship_done_time"].ParseToNullableInt(),
shop_id = row["shop_id"].ParseToLong(),
- shop_name = row["shop_name"].ParseToString(),
- shop_remark = row["shop_remark"].ParseToString(),
- soft_remark = row["soft_remark"].ParseToString(),
+ shop_name = row["shop_name"].ParseToNullableString(),
+ shop_remark = row["shop_remark"].ParseToNullableString(),
+ soft_remark = row["soft_remark"].ParseToNullableString(),
status = row["status"].ParseToNullableInt(),
- supplier_remark_exception = row["supplier_remark_exception"].ParseToString(),
- tel_number = row["tel_number"].ParseToString(),
- tel_number_ext_info = row["tel_number_ext_info"].ParseToString(),
+ supplier_remark_exception = row["supplier_remark_exception"].ParseToNullableString(),
+ tel_number = row["tel_number"].ParseToNullableString(),
+ tel_number_ext_info = row["tel_number_ext_info"].ParseToNullableString(),
transfer_warehouse_status = row["transfer_warehouse_status"].ParseToNullableInt(),
- unionid = row["unionid"].ParseToString(),
+ unionid = row["unionid"].ParseToNullableString(),
update_time = row["update_time"].ParseToInt(),
- user_name = row["user_name"].ParseToString(),
+ user_name = row["user_name"].ParseToNullableString(),
use_tel_number = row["use_tel_number"].ParseToNullableInt(),
- virtual_order_tel_number = row["virtual_order_tel_number"].ParseToString(),
+ virtual_order_tel_number = row["virtual_order_tel_number"].ParseToNullableString(),
};
if (order.order_id == "3737914129536416512")
{
@@ -255,7 +261,7 @@ namespace KJD_Web.BLL.WXXD
commission_amount = row["commission_amount"].ParseToNullableInt(),
freight = row["freight"].ParseToNullableInt(),
merchant_id = row["merchant_id"].ParseToLong(),
- order_id = row["order_id"].ParseToString(),
+ order_id = row["order_id"].ParseToNullableString(),
predict_commission_fee = row["predict_commission_fee"].ParseToNullableInt(),
purchase_price = row["purchase_price"].ParseToNullableInt(),
shop_id = row["shop_id"].ParseToLong(),
@@ -265,29 +271,29 @@ namespace KJD_Web.BLL.WXXD
erp_goods_id = row["erp_goods_id"].ParseToNullableLong(),
erp_goods_sku_id = row["erp_goods_sku_id"].ParseToNullableLong(),
estimate_price = row["estimate_price"].ParseToNullableInt(),
- extra_service = row["extra_service"].ParseToString(),
+ extra_service = row["extra_service"].ParseToNullableString(),
finish_aftersale_sku_cnt = row["finish_aftersale_sku_cnt"].ParseToNullableInt(),
- is_change_price = row["is_change_price"].ParseToString(),
- is_discounted = row["is_discounted"].ParseToString(),
+ is_change_price = row["is_change_price"].ParseToNullableString(),
+ is_discounted = row["is_discounted"].ParseToNullableString(),
market_price = row["market_price"].ParseToNullableInt(),
on_aftersale_sku_cnt = row["on_aftersale_sku_cnt"].ParseToNullableInt(),
- order_product_coupon_info_list = row["order_product_coupon_info_list"].ParseToString(),
- out_product_id = row["out_product_id"].ParseToString(),
- out_sku_id = row["out_sku_id"].ParseToString(),
- out_warehouse_id = row["out_warehouse_id"].ParseToString(),
- product_id = row["product_id"].ParseToString(),
+ order_product_coupon_info_list = row["order_product_coupon_info_list"].ParseToNullableString(),
+ out_product_id = row["out_product_id"].ParseToNullableString(),
+ out_sku_id = row["out_sku_id"].ParseToNullableString(),
+ out_warehouse_id = row["out_warehouse_id"].ParseToNullableString(),
+ product_id = row["product_id"].ParseToNullableString(),
real_price = row["real_price"].ParseToNullableInt(),
refund_status = row["refund_status"].ParseToNullableInt(),
- return_address = row["return_address"].ParseToString(),
+ return_address = row["return_address"].ParseToNullableString(),
sale_price = row["sale_price"].ParseToNullableInt(),
- sku_attrs = row["sku_attrs"].ParseToString(),
+ sku_attrs = row["sku_attrs"].ParseToNullableString(),
sku_cnt = row["sku_cnt"].ParseToNullableInt(),
- sku_code = row["sku_code"].ParseToString(),
- sku_deliver_info = row["sku_deliver_info"].ParseToString(),
- sku_id = row["sku_id"].ParseToString(),
- thumb_img = row["thumb_img"].ParseToString(),
- title = row["title"].ParseToString(),
- use_deduction = row["use_deduction"].ParseToString(),
+ sku_code = row["sku_code"].ParseToNullableString(),
+ sku_deliver_info = row["sku_deliver_info"].ParseToNullableString(),
+ sku_id = row["sku_id"].ParseToNullableString(),
+ thumb_img = row["thumb_img"].ParseToNullableString(),
+ title = row["title"].ParseToNullableString(),
+ use_deduction = row["use_deduction"].ParseToNullableString(),
};
orderItemList.Add(order);
}
@@ -380,35 +386,41 @@ namespace KJD_Web.BLL.WXXD
{
id = row["id"].ParseToLong(),
merchant_id = row["merchant_id"].ParseToLong(),
- order_id = row["order_id"].ParseToString(),
+ order_id = row["order_id"].ParseToNullableString(),
shop_id = row["shop_id"].ParseToLong(),
erp_goods_id = row["erp_goods_id"].ParseToNullableLong(),
erp_goods_sku_id = row["erp_goods_sku_id"].ParseToNullableLong(),
- product_id = row["product_id"].ParseToString(),
- sku_id = row["sku_id"].ParseToString(),
- after_sale_order_id = row["after_sale_order_id"].ParseToString(),
- complaint_id = row["complaint_id"].ParseToString(),
+ product_id = row["product_id"].ParseToNullableString(),
+ sku_id = row["sku_id"].ParseToNullableString(),
+ after_sale_order_id = row["after_sale_order_id"].ParseToNullableString(),
+ complaint_id = row["complaint_id"].ParseToNullableString(),
count = row["count"].ParseToNullableInt(),
create_time = row["create_time"].ParseToNullableInt(),
- details = row["details"].ParseToString(),
- fast_refund = row["fast_refund"].ParseToString(),
- merchant_upload_info = row["merchant_upload_info"].ParseToString(),
- openid = row["openid"].ParseToString(),
+ details = row["details"].ParseToNullableString(),
+ fast_refund = row["fast_refund"].ParseToNullableString(),
+ merchant_upload_info = row["merchant_upload_info"].ParseToNullableString(),
+ openid = row["openid"].ParseToNullableString(),
pull_status = row["pull_status"].ParseToNullableInt(),
- pull_time = row["pull_time"].ParseToString().ParseToDateTime(),
- reason = row["reason"].ParseToString(),
- reason_text = row["reason_text"].ParseToString(),
+ pull_time = row["pull_time"].ParseToNullableString().ParseToDateTime(),
+ reason = row["reason"].ParseToNullableString(),
+ reason_text = row["reason_text"].ParseToNullableString(),
refund_amount = row["refund_amount"].ParseToNullableInt(),
refund_reason = row["refund_reason"].ParseToNullableInt(),
- refund_resp = row["refund_resp"].ParseToString(),
- return_delivery_id = row["return_delivery_id"].ParseToString(),
- return_delivery_name = row["return_delivery_name"].ParseToString(),
- return_waybill_id = row["return_waybill_id"].ParseToString(),
- status = row["status"].ParseToString(),
- type = row["type"].ParseToString(),
- unionid = row["unionid"].ParseToString(),
+ refund_resp = row["refund_resp"].ParseToNullableString(),
+ return_delivery_id = row["return_delivery_id"].ParseToNullableString(),
+ return_delivery_name = row["return_delivery_name"].ParseToNullableString(),
+ return_waybill_id = row["return_waybill_id"].ParseToNullableString(),
+ status = row["status"].ParseToNullableString(),
+ type = row["type"].ParseToNullableString(),
+ unionid = row["unionid"].ParseToNullableString(),
update_time = row["update_time"].ParseToNullableInt(),
warehouse_status = row["warehouse_status"].ParseToNullableInt(),
+ return_city = row["return_city"].ParseToNullableString(),
+ return_county = row["return_county"].ParseToNullableString(),
+ return_detail = row["return_detail"].ParseToNullableString(),
+ return_province = row["return_province"].ParseToNullableString(),
+ return_tel = row["return_tel"].ParseToNullableString(),
+ return_user_name = row["return_user_name"].ParseToNullableString(),
};
refundItemList.Add(order);
}
@@ -598,16 +610,16 @@ namespace KJD_Web.BLL.WXXD
WXBuyMapInfoLst.Add(new WXBuyMapInfo()
{
id = row["id"].ParseToInt(),
- user_name = row["user_name"].ParseToString(),
- spu_code = row["spu_code"].ParseToString(),
- sku_code = row["sku_code"].ParseToString(),
- map_url = row["map_url"].ParseToString(),
- map_goods_name = row["map_goods_name"].ParseToString(),
- map_spec_name = row["map_spec_name"].ParseToString(),
- map_goods_id = row["map_goods_id"].ParseToString(),
- map_sku_id = row["map_sku_id"].ParseToString(),
- map_send_address = row["map_send_address"].ParseToString(),
- transit_warehouse_id = row["transit_warehouse_id"].ParseToString(),
+ user_name = row["user_name"].ParseToNullableString(),
+ spu_code = row["spu_code"].ParseToNullableString(),
+ sku_code = row["sku_code"].ParseToNullableString(),
+ map_url = row["map_url"].ParseToNullableString(),
+ map_goods_name = row["map_goods_name"].ParseToNullableString(),
+ map_spec_name = row["map_spec_name"].ParseToNullableString(),
+ map_goods_id = row["map_goods_id"].ParseToNullableString(),
+ map_sku_id = row["map_sku_id"].ParseToNullableString(),
+ map_send_address = row["map_send_address"].ParseToNullableString(),
+ transit_warehouse_id = row["transit_warehouse_id"].ParseToNullableString(),
add_time = Convert.ToDateTime(row["add_time"]),
mdy_time = Convert.ToDateTime(row["mdy_time"]),
});
@@ -714,33 +726,33 @@ namespace KJD_Web.BLL.WXXD
oms_wei_external_procurement_log_list.Add(new oms_wei_external_procurement_log()
{
id = row["id"].ParseToInt(),
- buyer_account = row["buyer_account"].ParseToString(),
- order_no = row["order_no"].ParseToString(),
- order_sku_id = row["order_sku_id"].ParseToString(),
+ buyer_account = row["buyer_account"].ParseToNullableString(),
+ order_no = row["order_no"].ParseToNullableString(),
+ order_sku_id = row["order_sku_id"].ParseToNullableString(),
out_amount = row["out_amount"].ParseToNullableInt(),
- out_order_no = row["out_order_no"].ParseToString(),
- purchaser_note = row["purchaser_note"].ParseToString(),
- created_time = row["created_time"].ParseToString().ParseToDateTime(),
- express_1_company = row["express_1_company"].ParseToString(),
- express_1_waybill = row["express_1_waybill"].ParseToString(),
- express_2_company = row["express_2_company"].ParseToString(),
- express_2_waybill = row["express_2_waybill"].ParseToString(),
- order_code = row["order_code"].ParseToString(),
- order_platform_code = row["order_platform_code"].ParseToString(),
- pickup_time = row["pickup_time"].ParseToString().ParseToDateTime(),
- platform = row["platform"].ParseToString(),
+ out_order_no = row["out_order_no"].ParseToNullableString(),
+ purchaser_note = row["purchaser_note"].ParseToNullableString(),
+ created_time = row["created_time"].ParseToNullableString().ParseToDateTime(),
+ express_1_company = row["express_1_company"].ParseToNullableString(),
+ express_1_waybill = row["express_1_waybill"].ParseToNullableString(),
+ express_2_company = row["express_2_company"].ParseToNullableString(),
+ express_2_waybill = row["express_2_waybill"].ParseToNullableString(),
+ order_code = row["order_code"].ParseToNullableString(),
+ order_platform_code = row["order_platform_code"].ParseToNullableString(),
+ pickup_time = row["pickup_time"].ParseToNullableString().ParseToDateTime(),
+ platform = row["platform"].ParseToNullableString(),
pre_allocated_order_no = row["pre_allocated_order_no"].ParseToNullableInt(),
- raw_message = row["raw_message"].ParseToString(),
- refund_status = row["refund_status"].ParseToString(),
+ raw_message = row["raw_message"].ParseToNullableString(),
+ refund_status = row["refund_status"].ParseToNullableString(),
transfer_warehouse_status = row["transfer_warehouse_status"].ParseToNullableInt(),
- updated_time = row["updated_time"].ParseToString().ParseToDateTime(),
+ updated_time = row["updated_time"].ParseToNullableString().ParseToDateTime(),
is_transfer_ship = row["is_transfer_ship"].ParseToNullableInt(),
- random_code = row["random_code"].ParseToString(),
+ random_code = row["random_code"].ParseToNullableString(),
transfer_refund_status = row["transfer_refund_status"].ParseToNullableInt(),
order_void_status = row["order_void_status"].ParseToNullableInt(),
warehouse_status = row["warehouse_status"].ParseToNullableInt(),
- inbound_time = row["inbound_time"].ParseToString().ParseToDateTimeNullable(),
- outbound_time = row["outbound_time"].ParseToString().ParseToDateTimeNullable(),
+ inbound_time = row["inbound_time"].ParseToNullableString().ParseToDateTimeNullable(),
+ outbound_time = row["outbound_time"].ParseToNullableString().ParseToDateTimeNullable(),
});
}
JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
@@ -969,7 +981,12 @@ namespace KJD_Web.BLL.WXXD
sql = " update erp.oms_wei_order set ";
if (out_after_sale_status != null)
- sql += " out_after_sale_status='" + out_after_sale_status + "',";
+ {
+ if (out_after_sale_status == "" || out_after_sale_status == "NULL")
+ sql += " out_after_sale_status=NULL,";
+ else
+ sql += " out_after_sale_status='" + out_after_sale_status + "',";
+ }
sql = sql.TrimEnd(',');
sql += " where order_id = '" + order_id + "';";
diff --git a/KJDService/KJD_WebService/Model/WxModel/oms_wei_refund.cs b/KJDService/KJD_WebService/Model/WxModel/oms_wei_refund.cs
index cbd3a8a..e6e7c68 100644
--- a/KJDService/KJD_WebService/Model/WxModel/oms_wei_refund.cs
+++ b/KJDService/KJD_WebService/Model/WxModel/oms_wei_refund.cs
@@ -139,5 +139,13 @@ namespace KJD_Web.Model.WxModel
/// 仓库受理状态
///
public int? warehouse_status { get; set; }
+
+
+ public string return_user_name { get; set; }
+ public string return_province { get; set; }
+ public string return_city { get; set; }
+ public string return_county { get; set; }
+ public string return_detail { get; set; }
+ public string return_tel { get; set; }
}
}
\ No newline at end of file
diff --git a/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs b/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs
index 7eb1b74..1999a32 100644
--- a/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs
+++ b/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs
@@ -517,6 +517,8 @@ namespace NaiBa.Util.Extension
}
else
{
+ if (obj is DateTime)
+ return (obj as DateTime?).Value.ToString("yyyy-MM-dd HH:mm:ss");
return obj.ToString();
}
}
diff --git a/TEMUKJD/Resources/empty_book_900_1200.jpg b/TEMUKJD/Resources/empty_book_900_1200.jpg
index e9a1241..aa15b48 100644
Binary files a/TEMUKJD/Resources/empty_book_900_1200.jpg and b/TEMUKJD/Resources/empty_book_900_1200.jpg differ
diff --git a/TEMUKJD/Resources/empty_book_900_1200_old.jpg b/TEMUKJD/Resources/empty_book_900_1200_old1.jpg
similarity index 100%
rename from TEMUKJD/Resources/empty_book_900_1200_old.jpg
rename to TEMUKJD/Resources/empty_book_900_1200_old1.jpg
diff --git a/TEMUKJD/Resources/empty_book_900_1200_old2.jpg b/TEMUKJD/Resources/empty_book_900_1200_old2.jpg
new file mode 100644
index 0000000..e9a1241
Binary files /dev/null and b/TEMUKJD/Resources/empty_book_900_1200_old2.jpg differ