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

调整 蜂鸟

Browse Source
This commit is contained in:
邹宗楠
2022-05-16 20:16:30 +08:00
parent 248c4fef2c
commit fe0ed99ab0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/partner/delivery/fn/waybill.go
View File

@@ -6,7 +6,6 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"strconv" "strconv"
"strings" "strings"
"time"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/partner/delivery" "git.rosy.net.cn/jx-callback/business/partner/delivery"
@@ -201,20 +200,23 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
// 订单状态 // 订单状态
func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) { func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) {
cc := &fnpsapi.OrderCallbackParam{}
if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
globals.SugarLogger.Debugf("FNPS strconv.Atoi fail :[%s]", err)
return fnpsapi.Err2CallbackResponse(err, "")
}
order := &model.Waybill{ order := &model.Waybill{
VendorWaybillID: utils.Int64ToStr(msg.Param.OrderId), VendorWaybillID: utils.Int64ToStr(cc.OrderId),
VendorWaybillID2: msg.Param.PartnerOrderCode, VendorWaybillID2: cc.PartnerOrderCode,
WaybillVendorID: model.VendorIDFengNiao, WaybillVendorID: model.VendorIDFengNiao,
CourierName: msg.Param.CarrierDriverName, CourierName: cc.CarrierDriverName,
CourierMobile: msg.Param.CarrierDriverPhone, CourierMobile: cc.CarrierDriverPhone,
VendorStatus: utils.Int2Str(msg.Param.OrderStatus), VendorStatus: utils.Int2Str(cc.OrderStatus),
StatusTime: utils.Timestamp2Time(msg.Param.PushTime), StatusTime: utils.Timestamp2Time(cc.PushTime),
Remark: msg.Param.Description, Remark: cc.Description,
} }
if msg.Param.PushTime == 0 { order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(cc.PartnerOrderCode)
order.StatusTime = time.Now()
}
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(utils.Int64ToStr(msg.Param.OrderId))
orderStatus, err := strconv.Atoi(order.VendorStatus) orderStatus, err := strconv.Atoi(order.VendorStatus)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("FNPS strconv.Atoi fail :[%s]", err) globals.SugarLogger.Debugf("FNPS strconv.Atoi fail :[%s]", err)