diff --git a/controllers/jx_order.go b/controllers/jx_order.go index b4367b17d..3bcf028cc 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -1086,7 +1086,10 @@ func (c *OrderController) TransferJdsOrder() { // @router /MergeJdsOrders [post] func (c *OrderController) MergeJdsOrders() { c.callMergeJdsOrders(func(params *tOrderMergeJdsOrdersParams) (retVal interface{}, errCode string, err error) { - + var vendorOrderIDs []string + if err = jxutils.Strings2Objs(params.VendorOrderIDs, &vendorOrderIDs); err == nil { + retVal, err = orderman.MergeJdsOrders(params.Ctx, vendorOrderIDs) + } return retVal, "", err }) }