- WaybillStatusFailed也会重新创建三方运单

- dadaapi.OrderStatusExpired映射为WaybillStatusCanceled（之前为WaybillStatusFailed）
- 达达重新创建运单时，判断之前的运单状态，如果是WaybillStatusFailed，则为新增订单
- 去掉dao. WrapDB

business/jxcallback/scheduler/defsch/defsch.go

@@ -409,20 +409,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 					// s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
 					globals.SugarLogger.Infof("OnWaybillStatusChanged CourierArrived order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)
 				}
-			case model.WaybillStatusFailed: // todo WaybillStatusFailed理解成订单整个失败了，不需要再尝试创建运单了，注意这里应该加个zabbix日志的报警
-				s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID)
-				if s.isBillCandidate(order, bill) {
-					s.resetTimer(savedOrderInfo, bill, isPending)
-					if !isPending {
-						globals.SugarLogger.Infof("OnWaybillStatusChanged WaybillStatusFailed, bill:%v", bill)
-						bill.WaybillVendorID = model.VendorIDUnknown
-						s.updateOrderByBill(order, bill, false)
-					}
-				} else {
-					// 创建运单失败时，可能到这里来（比如：818874313000121）
-					globals.SugarLogger.Infof("OnWaybillStatusChanged Failed bill:%v shouldn't got here, order details:%v", bill, order)
-				}
-			case model.WaybillStatusCanceled:
+			case model.WaybillStatusCanceled, model.WaybillStatusFailed:
 				s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID)
 				if s.isBillCandidate(order, bill) || order.WaybillVendorID == model.VendorIDUnknown {
 					s.resetTimer(savedOrderInfo, nil, isPending)