|
|
@ -410,7 +410,7 @@ huitongkuaidi 百世快递 |
|
|
|
.SetIf(isUpdateSubscribe, s => s.IsSubscribeKuaiDi100, true); |
|
|
|
updateSerivceOrderList.Add(update); |
|
|
|
|
|
|
|
if (isUpdateDelivery) |
|
|
|
if (isUpdateDelivery && insertExpressOrderList.Count(e => e.WayBillNo == serviceOrder.WayBillNo) == 0) |
|
|
|
{ |
|
|
|
insertExpressOrderList.Add(new ExpressOrder() |
|
|
|
{ |
|
|
@ -426,6 +426,22 @@ huitongkuaidi 百世快递 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (insertExpressOrderList.Count() > 0) |
|
|
|
{ |
|
|
|
var insertExpressOrderWayBillNoList = insertExpressOrderList.Select(e => e.WayBillNo).ToList(); |
|
|
|
var dbWayBillNoList = fsql.Select<ExpressOrder>().Where(e => insertExpressOrderWayBillNoList.Contains(e.WayBillNo)).ToList(e => e.WayBillNo); |
|
|
|
if (dbWayBillNoList.Count() > 0) |
|
|
|
{ |
|
|
|
for (var i = 0; i < insertExpressOrderList.Count(); i++) |
|
|
|
{ |
|
|
|
if (dbWayBillNoList.Any(w => w == insertExpressOrderList[i].WayBillNo)) |
|
|
|
{ |
|
|
|
insertExpressOrderList.Remove(insertExpressOrderList[i]); |
|
|
|
i--; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
fsql.Transaction(() => |
|
|
|
{ |
|
|
|