Commit 1efa7783 authored by liudong1993's avatar liudong1993

订单导入调整

parent 941d3544
......@@ -5197,6 +5197,15 @@ namespace Mall.Module.Product
#endregion
}
if (OrderNoList.Any()) {
//验证订单号是否有重复
var goList = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { orderNos = string.Join(",", OrderNoList.Select(x => "'" + x + "'")), TenantId = tenantId, MallBaseId = mallBaseId });
if (goList.Any()) {
string msg = string.Join(",", goList.Select(x => x.OrderNo));
return "订单号有重复,订单号:"+ msg;
}
}
#region 初始化数据
//平台
var PlatformList = EnumHelper.GetEnumList(typeof(UserSourceEnum));
......@@ -5221,7 +5230,84 @@ namespace Mall.Module.Product
OrderNoList = OrderNoList.Distinct().ToList();
foreach (var OrderNo in OrderNoList) {
var DetailList = list.Where(x => x.OrderNo == OrderNo).ToList();
var OrderModel = DetailList.FirstOrDefault();
var OrderModel1 = DetailList.FirstOrDefault();
var OrderModel = new RB_Goods_Order_Extend()
{
OrderId = OrderModel1.OrderId,
OrderNo = OrderModel1.OrderNo,
MerchantsNo = OrderModel1.MerchantsNo,
UserId = OrderModel1.UserId,
OrderSource = OrderModel1.OrderSource,
PaymentWay = OrderModel1.PaymentWay,
PreferPrice = OrderModel1.PreferPrice,
Income = OrderModel1.Income,
FreightMoney = OrderModel1.FreightMoney,
Fee = OrderModel1.Fee,
Refund = OrderModel1.Refund,
CouponMoney = OrderModel1.CouponMoney,
CouponsIds = OrderModel1.CouponsIds,
DeliveryMethod = OrderModel1.DeliveryMethod,
Consignee = OrderModel1.Consignee,
Mobile = OrderModel1.Mobile,
Country = OrderModel1.Country,
Province = OrderModel1.Province,
City = OrderModel1.City,
District = OrderModel1.District,
ShoppingAddress = OrderModel1.ShoppingAddress,
BuyerMessage = OrderModel1.BuyerMessage,
Remark = OrderModel1.Remark,
OrderStatus = OrderModel1.OrderStatus,
Recycled = OrderModel1.Recycled,
Status = OrderModel1.Status,
TenantId = OrderModel1.TenantId,
MallBaseId = OrderModel1.MallBaseId,
CreateDate = OrderModel1.CreateDate,
UpdateDate = OrderModel1.UpdateDate,
PaymentTime = OrderModel1.PaymentTime,
DeliveryTime = OrderModel1.DeliveryTime,
ReceivingTime = OrderModel1.ReceivingTime,
FinishTime = OrderModel1.FinishTime,
CancelTime = OrderModel1.CancelTime,
IsApplyForCancel = OrderModel1.IsApplyForCancel,
HistoryOrderStatus = OrderModel1.HistoryOrderStatus,
CancelRemark = OrderModel1.CancelRemark,
ApplyForCancelStatus = OrderModel1.ApplyForCancelStatus,
RejectRemark = OrderModel1.RejectRemark,
UserName = OrderModel1.UserName,
PName = OrderModel1.PName,
CName = OrderModel1.CName,
DName = OrderModel1.DName,
PlatformNameImport = OrderModel1.PlatformNameImport,
CostMoneyImport = OrderModel1.CostMoneyImport,
OrderStatusImport = OrderModel1.OrderStatusImport,
OriginalMoneyImport = OrderModel1.OriginalMoneyImport,
PaymentStatusImport = OrderModel1.PaymentStatusImport,
PaymentWayImport = OrderModel1.PaymentWayImport,
SellMoneyImport = OrderModel1.SellMoneyImport,
SpecificationImport = OrderModel1.SpecificationImport,
DistrictAddress = OrderModel1.DistrictAddress,
GoodsName = OrderModel1.GoodsName,
OrderNum = OrderModel1.OrderNum,
ProductCode = OrderModel1.ProductCode,
OrderType = OrderModel1.OrderType,
Use_Integral = OrderModel1.Use_Integral,
AddressId = OrderModel1.AddressId,
DetailList = OrderModel1.DetailList,
EndTime = OrderModel1.EndTime,
ExcelEnumIds = OrderModel1.ExcelEnumIds,
GoodsId = OrderModel1.GoodsId,
GoodsTotalNum = OrderModel1.GoodsTotalNum,
IsFormShoppingCart = OrderModel1.IsFormShoppingCart,
IsOrderCommission = OrderModel1.IsOrderCommission,
OrderCommissionList = OrderModel1.OrderCommissionList,
OrderIds = OrderModel1.OrderIds,
orderNos = OrderModel1.orderNos,
OrderStatusIds = OrderModel1.OrderStatusIds,
ShoppingAddressId = OrderModel1.ShoppingAddressId,
ShoppingCartIdList = OrderModel1.ShoppingCartIdList,
StartTime = OrderModel1.StartTime,
User_Coupon_Id = OrderModel1.User_Coupon_Id
};
#region 订单主表赋值
//订单平台
var platformModel = PlatformList.Where(x => x.Key == OrderModel.PlatformNameImport).FirstOrDefault();
......
......@@ -3769,7 +3769,7 @@ namespace Mall.Module.Product
{
//最直接的方法Regex.Unescape(str);
StringBuilder strResult = new StringBuilder();
if (!string.IsNullOrEmpty(str))
if (!string.IsNullOrEmpty(str)&& str.Contains("\\u"))
{
string[] strlist = str.Replace("\\", "").Split('u');
try
......@@ -3784,8 +3784,9 @@ namespace Mall.Module.Product
{
return Regex.Unescape(str);
}
return strResult.ToString();
}
return strResult.ToString();
return str;
}
#endregion
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment