Merge remote-tracking branch 'origin/mark' into yonghui

controllers/jx_order.go

@@ -231,6 +231,22 @@ func (c *OrderController) GetOrderWaybillInfo() {
 	})
 }
 
+// @Title 补全遗漏的订单
+// @Description 补全遗漏的订单
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorOrderID	formData	string	true	"订单ID"
+// @Param	vendorID		formData	int		true	"订单所属的厂商ID"
+// @Param	tipFee			formData	int		true	"小费"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UpdateOrderWaybillTip [post]
+func (c *OrderController) UpdateOrderWaybillTip() {
+	c.callUpdateOrderWaybillTip(func(params *tOrderUpdateOrderWaybillTipParams) (retVal interface{}, errCode string, err error) {
+		err = defsch.FixedScheduler.SetOrderWaybillTip(params.Ctx, params.VendorOrderID, params.VendorID, int64(params.TipFee))
+		return retVal, "", err
+	})
+}
+
 // @Title 导出美团运单
 // @Description 导出美团运单（excel文件），注意时间跨度不要太长，最多只能是一个月
 // @Param	token			header	string	true	"认证token"