- 调整QueryOrderWaybillFeeInfo

business/partner/partner.go

@@ -63,11 +63,21 @@ type StatusActionParams struct {
 	TimeoutGap int           // 以秒为单位的随机时间，0在GetStatusActionConfig返回时表示不修改缺省
 }
 
+const (
+	WaybillFeeErrCodeCourierNotOpen      = 1  //配送门店没有启用
+	WaybillFeeErrCodeCourierNotSupported = 2  //配送门店不被系统支持
+	WaybillFeeErrCodeCourierForbidden    = 3  //配送门店内部禁用
+	WaybillFeeErrCodeCourierOthers       = 10 //其它错误
+)
+
 type WaybillFeeInfo struct {
-	ErrStr         string `json:"errStr"`
-	RefDeliveryFee int64  `json:"refDeliveryFee"`
-	RefAddFee      int64  `json:"refAddFee"`
-	DeliveryFee    int64  `json:"deliveryFee"`
+	ErrCode        int            `json:"errCode"`
+	ErrStr         string         `json:"errStr"`
+	RefDeliveryFee int64          `json:"refDeliveryFee"`
+	RefAddFee      int64          `json:"refAddFee"`
+	DeliveryFee    int64          `json:"deliveryFee"`
+	TimeoutSecond  int            `json:"timeoutSecond"` // 系统会自动发运单的倒计时
+	Waybill        *model.Waybill `json:"waybill"`
 }
 
 func (s *StatusActionParams) GetRefTimeout(statusTime time.Time) (timeout time.Duration) {
@@ -129,6 +139,8 @@ type IOrderManager interface {
 
 	SaveOrderFinancialInfo(order *model.OrderFinancial, operation string) (err error)
 	SaveAfsOrderFinancialInfo(afsOrder *model.AfsOrder) (err error)
+
+	GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isNotEnded bool) (bills []*model.Waybill, err error)
 }
 
 type IStoreManager interface {