- add SaveOrder to IOrderManager

- add Map2Order to IPurchasePlatformHandler

business/jxcallback/orderman/order.go

@@ -75,7 +75,7 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus strin
 	status.VendorStatus = msgVendorStatus
 	isDuplicated, err := addOrderOrWaybillStatus(status, db)
 	if err == nil && !isDuplicated {
-		if isDuplicated, err = c.saveOrder(order, false, db); err == nil && !isDuplicated {
+		if isDuplicated, err = c.SaveOrder(order, false, db); err == nil && !isDuplicated {
 			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
 		}
 	}
@@ -108,7 +108,7 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus st
 		if err != nil {
 			return err
 		}
-		if isDuplicated, err = c.saveOrder(order, true, db); err == nil && !isDuplicated {
+		if isDuplicated, err = c.SaveOrder(order, true, db); err == nil && !isDuplicated {
 			// 因为订单调度器需要的是真实状态，所以用order的状态
 			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
 			err = scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order), false)
@@ -125,8 +125,7 @@ func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err
 	return err
 }
 
-// private
+func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) {
-func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) {
 	// 忽略查找JX信息错误
 	c.updateOrderOtherInfo(order, db)
 	order.ID = 0

business/partner/partner.go

@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"github.com/astaxie/beego/orm"
 )
 
 const (
@@ -42,6 +43,8 @@ var (
 )
 
 type IOrderManager interface {
+	SaveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error)
+
 	OnOrderNew(order *model.GoodsOrder, msgVendorStatus string) (err error)
 	OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus string) (err error)
 	OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error)
@@ -61,6 +64,7 @@ type IOrderManager interface {
 
 type IPurchasePlatformHandler interface {
 	GetStatusFromVendorStatus(vendorStatus string) int
+	Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder)
 	GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error)
 	GetStatusActionTimeout(statusType, status int) time.Duration
 

business/partner/purchase/ebai/order.go

@@ -45,9 +45,17 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 	result, err := api.EbaiAPI.OrderGet(vendorOrderID)
 	// globals.SugarLogger.Info(result)
 	if err == nil {
+		order = p.Map2Order(result)
+	}
+	return order, err
+}
+
+func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	result := orderData
 	shopMap := result["shop"].(map[string]interface{})
 	orderMap := result["order"].(map[string]interface{})
 	userMap := result["user"].(map[string]interface{})
+	vendorOrderID := orderMap["order_id"].(string)
 	order = &model.GoodsOrder{
 		VendorOrderID:         vendorOrderID,
 		VendorOrderID2:        orderMap["eleme_order_id"].(string),
@@ -125,8 +133,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 		order.Weight += sku.Weight * sku.Count
 	}
 	// setOrederDetailFee(result, order)
-	}
+	return order
-	return order, err
 }
 
 func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {

business/partner/purchase/elm/order.go

@@ -123,6 +123,14 @@ func (c *PurchaseHandler) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancel
 func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
 	result, err := api.ElmAPI.GetOrder(orderID)
 	if err == nil {
+		order = c.Map2Order(result)
+	}
+	return order, err
+}
+
+func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	result := orderData
+	orderID := result["id"].(string)
 	phoneList := result["phoneList"].([]interface{})
 	consigneeMobile := ""
 	if len(phoneList) > 0 {
@@ -186,8 +194,7 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
 		}
 	}
 	setOrederDetailFee(result, order)
-	}
+	return order
-	return order, err
 }
 
 func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {

business/partner/purchase/jd/order.go

@@ -79,6 +79,19 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
 	task.Run()
 	task.GetResult(0)
 	if err == nil {
+		order = c.Map2Order(result)
+		if err2 == nil {
+			order.ConsigneeMobile2 = result2
+		} else {
+			// globals.SugarLogger.Warnf("jd GetOrder orderID:%s, GetRealMobile4Order failed with error:%v", orderID, err2)
+		}
+	}
+	return order, err
+}
+
+func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	result := orderData
+	orderID := utils.Int64ToStr(utils.MustInterface2Int64(result["orderId"]))
 	order = &model.GoodsOrder{
 		VendorOrderID:         orderID,
 		VendorID:              model.VendorIDJD,
@@ -98,11 +111,6 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
 		ActualPayPrice:        utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
 		Skus:                  []*model.OrderSku{},
 	}
-		if err2 == nil {
-			order.ConsigneeMobile2 = result2
-		} else {
-			// globals.SugarLogger.Warnf("jd GetOrder orderID:%s, GetRealMobile4Order failed with error:%v", orderID, err2)
-		}
 	order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
 	businessTage := utils.Interface2String(result["businessTag"])
 	if strings.Index(businessTage, "dj_aging_immediately") >= 0 {
@@ -152,8 +160,7 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
 		order.Weight += sku.Weight * sku.Count
 	}
 	setOrederDetailFee(result, order)
-	}
+	return order
-	return order, err
 }
 
 func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {

business/partner/purchase/mtwm/order.go

@@ -1,6 +1,7 @@
 package mtwm
 
 import (
+	"fmt"
 	"net/url"
 	"time"
 
@@ -43,6 +44,14 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 	result, err := api.MtwmAPI.OrderGetOrderDetail(utils.Str2Int64(vendorOrderID), true)
 	// globals.SugarLogger.Info(result)
 	if err == nil {
+		order = p.Map2Order(result)
+	}
+	return order, err
+}
+
+func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	result := orderData
+	vendorOrderID := utils.Int64ToStr(utils.MustInterface2Int64(result["order_id"]))
 	deliveryTime := utils.Interface2Int64WithDefault(result["delivery_time"], 0)
 	order = &model.GoodsOrder{
 		VendorOrderID:         vendorOrderID,
@@ -78,7 +87,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 
 	var detail []map[string]interface{}
 	if err := utils.UnmarshalUseNumber([]byte(result["detail"].(string)), &detail); err != nil {
-			return nil, err
+		panic(fmt.Sprintf("mtwm Map2Order vendorID:%s failed with error:%v", vendorOrderID, err))
 	}
 	// detail := result["detail"].([]interface{})
 	for _, product := range detail {
@@ -110,8 +119,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 		order.Weight += sku.Weight * sku.Count
 	}
 	// setOrederDetailFee(result, order)
-	}
+	return order
-	return order, err
 }
 
 func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) {

business/partner/purchase/weimob/wsc/order.go

@@ -106,6 +106,13 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 	if err != nil {
 		return nil, err
 	}
+	order = p.Map2Order(result)
+	return order, err
+}
+
+func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	result := orderData
+	vendorOrderID := utils.Int64ToStr(utils.MustInterface2Int64(result["orderNo"]))
 	deliveryDetail := result["deliveryDetail"].(map[string]interface{})
 	logisticsDeliveryDetail := deliveryDetail["logisticsDeliveryDetail"].(map[string]interface{})
 	// paymentInfo := result["paymentInfo"].(map[string]interface{})
@@ -156,7 +163,7 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 	}
 	p.arrangeSaleStore(order, utils.Interface2String(logisticsDeliveryDetail["receiverCity"]), utils.Interface2String(logisticsDeliveryDetail["receiverProvince"]))
 	p.setStoreOrderSeq(order)
-	return order, err
+	return order
 }
 
 func (p *PurchaseHandler) GetStatusActionTimeout(statusType, status int) time.Duration {