From 3e3174760aa1630b5b8de2ecc6ac2649b2bce994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 31 Aug 2020 18:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/jx_order.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
 	})
 }