liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- GoodsOrder.ConsigneeMobile2 for real user mobile.

Browse Source
This commit is contained in:
gazebo
2019-01-08 18:21:50 +08:00
parent bffc72f751
commit b6f1dc8721
10 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/purchase/ebai/order.go
View File

@@ -84,8 +84,8 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
}
deliveryGeo := userMap["coord"].(map[string]interface{})
originalLng := utils.MustInterface2Float64(deliveryGeo["longitude"])
originalLat := utils.MustInterface2Float64(deliveryGeo["latitude"])
originalLng := utils.Interface2FloatWithDefault(deliveryGeo["longitude"], 0.0) // 饿百的订单在过一段时间后，经纬度信息会变成字符串"**"
originalLat := utils.Interface2FloatWithDefault(deliveryGeo["latitude"], 0.0)
lng, lat, err2 := api.AutonaviAPI.CoordinateConvert(originalLng, originalLat, autonavi.CoordSysBaidu)
if err2 == nil {
originalLng = lng

24
business/partner/purchase/jd/order.go
View File

@@ -7,6 +7,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
@@ -60,7 +61,23 @@ func (c *PurchaseHandler) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi
func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
globals.SugarLogger.Debugf("jd GetOrder orderID:%s", orderID)
result, err := api.JdAPI.QuerySingleOrder(orderID)
var (
result map[string]interface{}
result2 string
err2 error
)
task := tasksch.NewParallelTask("jd GetOrder", nil, "admin", func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
taskIndex := batchItemList[0].(int)
switch taskIndex {
case 0:
result, err = api.JdAPI.QuerySingleOrder(orderID)
case 1:
result2, err2 = api.JdAPI.GetRealMobile4Order(orderID)
}
return nil, nil
}, []int{0, 1})
task.Run()
task.GetResult(0)
if err == nil {
order = &model.GoodsOrder{
VendorOrderID: orderID,
@@ -81,6 +98,11 @@ 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 {

6
business/partner/purchase/jd/order_legacy_comment.go
View File

@@ -157,8 +157,10 @@ func (c *PurchaseHandler) replyOrderComment(intOrderID int64, jdStoreNo string,
// }
// return nil
// }, "replyOrderComment %d", intOrderID)
err2 := api.JdAPI.OrgReplyComment(intOrderID, jdStoreNo, content, utils.GetAPIOperator(""))
globals.SugarLogger.Debugf("replyOrderComment orderID:%d, error:%v", intOrderID, err2)
if globals.ReallySendWeixinMsg {
err2 := api.JdAPI.OrgReplyComment(intOrderID, jdStoreNo, content, utils.GetAPIOperator(""))
globals.SugarLogger.Debugf("replyOrderComment orderID:%d, error:%v", intOrderID, err2)
}
})
return nil
}