This commit is contained in:
邹宗楠
2025-02-07 11:11:02 +08:00
parent 43f2974e25
commit af03a000e6
4 changed files with 40 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
beego "github.com/astaxie/beego/server/web"
"strconv"
"strings"
"time"
@@ -254,7 +255,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
good, err := dao.GetSimpleOrder(dao.GetDB(), cc.PartnerOrderCode)
if good == nil || good.VendorOrderID == "" || err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(resultParam), fnpsapi.FengNiaoCallbackTypeOrder); err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(resultParam), fnpsapi.FengNiaoCallbackTypeOrder, beego.BConfig.RunMode); err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
return fnpsapi.Err2CallbackResponse(nil, "")
@@ -379,11 +380,12 @@ func tiktokStatusPush(order *model.Waybill, orderStatus int64, lng, lat, vendorO
func OnWaybillExceptFn(msg *fnpsapi.AbnormalReportNotify, reallyData *fnpsapi.ShortStatus) (retVal *fnpsapi.CallbackResponse) {
order, err := dao.GetSimpleOrder(dao.GetDB(), msg.PartnerOrderCode)
if order == nil || order.VendorOrderID == "" || err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(reallyData), fnpsapi.FengNiaoCallbackTypeAbnormal); err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(reallyData), fnpsapi.FengNiaoCallbackTypeAbnormal, beego.BConfig.RunMode); err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
return fnpsapi.Err2CallbackResponse(nil, "")
}
model.StoreSkuBind{}
return CurDeliveryHandler.OnWaybillExcept(msg)
}