- cancel waybill reason added.

- api operator added.
- token added.

business/partner/partner.go

@@ -6,6 +6,18 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
+const (
+	CancelWaybillReasonNotAcceptIntime   = 1
+	CancelWaybillReasonSwitch2SelfFailed = 2
+	CancelWaybillReasonOther             = 10
+)
+
+var (
+	CancelWaybillReasonStrNotAcceptIntime      = "没有及时抢单"
+	CancelWaybillReasonStrSwitch2SelfFailed    = "转自送失败"
+	CancelWaybillReasonStrOrderAlreadyFinished = "订单已经结束"
+)
+
 var (
 	CurOrderManager IOrderManager
 )
@@ -27,25 +39,25 @@ type IPurchasePlatformHandler interface {
 	GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error)
 	GetStatusActionTimeout(statusType, status int) time.Duration
 
-	AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error)
-	PickupGoods(order *model.GoodsOrder) (err error)
+	AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error)
+	PickupGoods(order *model.GoodsOrder, userName string) (err error)
 
 	// 将订单从购物平台配送转为自送
-	Swtich2SelfDeliver(order *model.GoodsOrder) (err error)
+	Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error)
 
 	// 将订单从购物平台配送转为自送后又送达
-	Swtich2SelfDelivered(order *model.GoodsOrder) (err error)
+	Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error)
 
 	// 完全自送的门店表示开始配送
-	SelfDeliverDelievering(order *model.GoodsOrder) (err error)
+	SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error)
 
 	// 完全自送的门店表示配送完成
-	SelfDeliverDelievered(order *model.GoodsOrder) (err error)
+	SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error)
 }
 
 type IDeliveryPlatformHandler interface {
 	CreateWaybill(order *model.GoodsOrder, policy func(deliveryFee, addFee int64) error) (bill *model.Waybill, err error)
-	CancelWaybill(bill *model.Waybill) (err error)
+	CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error)
 }
 
 func Init(curOrderManager IOrderManager) {