添加运单,号,添加下单价格校验

business/partner/delivery/fn/waybill.go

@@ -77,7 +77,6 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 	bill.Status = model.WaybillStatusCanceled
 	bill.Remark = cancelReason
 	partner.CurOrderManager.OnWaybillStatusChanged(bill)
-	fmt.Println("fn cancle order ============", err)
 	return err
 }
 
@@ -139,8 +138,9 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 		parameter.OrderSource = "109"
 	}
 
-	// 创建蜂鸟订单
-	if err = api.FnAPI.CreateOrder(parameter); err != nil {
+	// 创建蜂鸟订单,运单id
+	fnOrderId, err := api.FnAPI.CreateOrder(parameter)
+	if err != nil {
 		globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, error:%v", order.VendorOrderID, parameter, err)
 		return nil, err
 	}
@@ -149,8 +149,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 	bill = &model.Waybill{
 		VendorOrderID:    order.VendorOrderID,
 		OrderVendorID:    order.VendorID,
-		VendorWaybillID:  "",
-		VendorWaybillID2: "",
+		VendorWaybillID:  fnOrderId,
+		VendorWaybillID2: order.VendorOrderID,
 		WaybillVendorID:  model.VendorIDFengNiao,
 		DesiredFee:       GetDesiredFee(order.VendorOrderID),
 	}
@@ -223,10 +223,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackRespon
 		return fnpsapi.Err2CallbackResponse(err, "")
 	}
 	switch orderStatus {
-	case fnpsapi.OrderStatusAcceptCreate: // 0 创建订单
-		order.DesiredFee = GetDesiredFee(order.VendorOrderID)
-		order.Status = model.WaybillStatusNew //5 带调度
-	case fnpsapi.OrderStatusAccept: // 1 新运单
+	case fnpsapi.OrderStatusAcceptCreate, fnpsapi.OrderStatusAccept: // 0 创建订单
 		order.DesiredFee = GetDesiredFee(order.VendorOrderID)
 		order.Status = model.WaybillStatusNew //5 带调度
 	case fnpsapi.OrderStatusAssigned: //20分配骑手

business/partner/delivery/mtps/waybill_test.go

@@ -34,3 +34,4 @@ func TestCancelWaybill(t *testing.T) {
 		t.Fatal(err.Error())
 	}
 }
+