- add SaveOrder to IOrderManager
- add Map2Order to IPurchasePlatformHandler
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package mtwm
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"time"
|
||||
|
||||
@@ -43,77 +44,84 @@ 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 {
|
||||
deliveryTime := utils.Interface2Int64WithDefault(result["delivery_time"], 0)
|
||||
order = &model.GoodsOrder{
|
||||
VendorOrderID: vendorOrderID,
|
||||
VendorOrderID2: utils.Int64ToStr(utils.MustInterface2Int64(result["wm_order_id_view"])),
|
||||
VendorID: model.VendorIDMTWM,
|
||||
VendorStoreID: result["app_poi_code"].(string),
|
||||
StoreID: int(utils.Str2Int64(result["app_poi_code"].(string))),
|
||||
StoreName: result["wm_poi_name"].(string),
|
||||
ConsigneeName: result["recipient_name"].(string),
|
||||
ConsigneeMobile: result["recipient_phone"].(string),
|
||||
ConsigneeAddress: result["recipient_address"].(string),
|
||||
CoordinateType: model.CoordinateTypeMars,
|
||||
BuyerComment: utils.TrimBlankChar(utils.Interface2String(result["caution"])),
|
||||
ExpectedDeliveredTime: getTimeFromTimestamp(deliveryTime),
|
||||
VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["status"])),
|
||||
OrderSeq: int(utils.MustInterface2Int64(result["day_seq"])),
|
||||
StatusTime: getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])),
|
||||
OriginalData: string(utils.MustMarshal(result)),
|
||||
ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["total"])),
|
||||
Skus: []*model.OrderSku{},
|
||||
}
|
||||
order.Status = p.GetStatusFromVendorStatus(order.VendorStatus)
|
||||
if deliveryTime == 0 {
|
||||
order.BusinessType = model.BusinessTypeImmediate
|
||||
} else {
|
||||
order.BusinessType = model.BusinessTypeDingshida
|
||||
}
|
||||
|
||||
originalLng := utils.MustInterface2Float64(result["longitude"])
|
||||
originalLat := utils.MustInterface2Float64(result["latitude"])
|
||||
order.ConsigneeLng = jxutils.StandardCoordinate2Int(originalLng)
|
||||
order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat)
|
||||
|
||||
var detail []map[string]interface{}
|
||||
if err := utils.UnmarshalUseNumber([]byte(result["detail"].(string)), &detail); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// detail := result["detail"].([]interface{})
|
||||
for _, product := range detail {
|
||||
// product := product2.(map[string]interface{})
|
||||
skuName := product["food_name"].(string)
|
||||
_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName)
|
||||
skuID := utils.Interface2String(product["sku_id"])
|
||||
sku := &model.OrderSku{
|
||||
VendorOrderID: order.VendorOrderID,
|
||||
VendorID: model.VendorIDMTWM,
|
||||
Count: int(utils.MustInterface2Float64(product["quantity"])),
|
||||
SkuID: int(utils.Str2Int64WithDefault(skuID, 0)),
|
||||
VendorSkuID: skuID,
|
||||
SkuName: skuName,
|
||||
Weight: jxutils.FormatSkuWeight(specQuality, specUnit), // 订单信息里没有重量,只有名字里尝试找
|
||||
SalePrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])),
|
||||
// PromotionType: int(utils.MustInterface2Int64(product["promotionType"])),
|
||||
}
|
||||
if sku.Weight == 0 {
|
||||
sku.Weight = 222 // 如果名字里找不到缺省给半斤左右的一个特别值
|
||||
}
|
||||
// if product["isGift"].(bool) {
|
||||
// sku.SkuType = 1
|
||||
// }
|
||||
order.Skus = append(order.Skus, sku)
|
||||
order.SkuCount++
|
||||
order.GoodsCount += sku.Count
|
||||
order.SalePrice += sku.SalePrice * int64(sku.Count)
|
||||
order.Weight += sku.Weight * sku.Count
|
||||
}
|
||||
// setOrederDetailFee(result, order)
|
||||
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,
|
||||
VendorOrderID2: utils.Int64ToStr(utils.MustInterface2Int64(result["wm_order_id_view"])),
|
||||
VendorID: model.VendorIDMTWM,
|
||||
VendorStoreID: result["app_poi_code"].(string),
|
||||
StoreID: int(utils.Str2Int64(result["app_poi_code"].(string))),
|
||||
StoreName: result["wm_poi_name"].(string),
|
||||
ConsigneeName: result["recipient_name"].(string),
|
||||
ConsigneeMobile: result["recipient_phone"].(string),
|
||||
ConsigneeAddress: result["recipient_address"].(string),
|
||||
CoordinateType: model.CoordinateTypeMars,
|
||||
BuyerComment: utils.TrimBlankChar(utils.Interface2String(result["caution"])),
|
||||
ExpectedDeliveredTime: getTimeFromTimestamp(deliveryTime),
|
||||
VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["status"])),
|
||||
OrderSeq: int(utils.MustInterface2Int64(result["day_seq"])),
|
||||
StatusTime: getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])),
|
||||
OriginalData: string(utils.MustMarshal(result)),
|
||||
ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["total"])),
|
||||
Skus: []*model.OrderSku{},
|
||||
}
|
||||
order.Status = p.GetStatusFromVendorStatus(order.VendorStatus)
|
||||
if deliveryTime == 0 {
|
||||
order.BusinessType = model.BusinessTypeImmediate
|
||||
} else {
|
||||
order.BusinessType = model.BusinessTypeDingshida
|
||||
}
|
||||
|
||||
originalLng := utils.MustInterface2Float64(result["longitude"])
|
||||
originalLat := utils.MustInterface2Float64(result["latitude"])
|
||||
order.ConsigneeLng = jxutils.StandardCoordinate2Int(originalLng)
|
||||
order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat)
|
||||
|
||||
var detail []map[string]interface{}
|
||||
if err := utils.UnmarshalUseNumber([]byte(result["detail"].(string)), &detail); err != nil {
|
||||
panic(fmt.Sprintf("mtwm Map2Order vendorID:%s failed with error:%v", vendorOrderID, err))
|
||||
}
|
||||
// detail := result["detail"].([]interface{})
|
||||
for _, product := range detail {
|
||||
// product := product2.(map[string]interface{})
|
||||
skuName := product["food_name"].(string)
|
||||
_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName)
|
||||
skuID := utils.Interface2String(product["sku_id"])
|
||||
sku := &model.OrderSku{
|
||||
VendorOrderID: order.VendorOrderID,
|
||||
VendorID: model.VendorIDMTWM,
|
||||
Count: int(utils.MustInterface2Float64(product["quantity"])),
|
||||
SkuID: int(utils.Str2Int64WithDefault(skuID, 0)),
|
||||
VendorSkuID: skuID,
|
||||
SkuName: skuName,
|
||||
Weight: jxutils.FormatSkuWeight(specQuality, specUnit), // 订单信息里没有重量,只有名字里尝试找
|
||||
SalePrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])),
|
||||
// PromotionType: int(utils.MustInterface2Int64(product["promotionType"])),
|
||||
}
|
||||
if sku.Weight == 0 {
|
||||
sku.Weight = 222 // 如果名字里找不到缺省给半斤左右的一个特别值
|
||||
}
|
||||
// if product["isGift"].(bool) {
|
||||
// sku.SkuType = 1
|
||||
// }
|
||||
order.Skus = append(order.Skus, sku)
|
||||
order.SkuCount++
|
||||
order.GoodsCount += sku.Count
|
||||
order.SalePrice += sku.SalePrice * int64(sku.Count)
|
||||
order.Weight += sku.Weight * sku.Count
|
||||
}
|
||||
// setOrederDetailFee(result, order)
|
||||
return order
|
||||
}
|
||||
|
||||
func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) {
|
||||
var err error
|
||||
if msg.Cmd == mtwmapi.MsgTypeNewOrder || msg.Cmd == mtwmapi.MsgTypeOrderModified {
|
||||
|
||||
Reference in New Issue
Block a user