合并订单

2020-08-31 18:13:08 +08:00
parent 3320ff2438
commit 3e3174760a
1 changed files with 4 additions and 1 deletions
--- 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
 	})
 }