修改各种发单是扣款,品牌扣款和门店扣款,品牌充值门店充值

platformapi/fnpsapi/order.go

@@ -31,6 +31,8 @@ const (
 	OrderStatusDelivering   = 2  //配送中
 	OrderStatusDelivered    = 3  //已送达
 	OrderStatusException    = 5  //异常
+
+	WayBillPressureOrderTime = 1200000 // 蜂鸟分配骑手超过二十分钟不扣款
 )
 
 // 蜂鸟预下单
@@ -163,7 +165,7 @@ func (a *API) PreCancelOrder(req *PreCancelOrderReq) (actualCancelCostCent int64
 	return
 }
 
-// cancelOrder  取消订单
+// CancelOrder  取消订单
 func (a *API) CancelOrder(req *CancelOrderReq) (err error) {
 	if req.PartnerOrderCode == "" && req.OrderId == "" {
 		return errors.New("内部订单号或者外部订单号比填写一个")