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

fnps

Browse Source
This commit is contained in:
苏尹岚
2020-12-21 10:42:37 +08:00
parent 0b5b3884cf
commit bf6c68930c
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ func (c *DeliveryHandler) GetVendorID() int {
func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
err = api.FnAPI.CancelOrder(&fnpsapi.CancelOrderParam{ err = api.FnAPI.CancelOrder(&fnpsapi.CancelOrderParam{
PartnerOrderCode: bill.VendorOrderID, PartnerOrderCode: bill.VendorOrderID,
OrderCancelReasonCode: 1, //用户取消 OrderCancelReasonCode: 2, //用户取消
OrderCancelCode: fnpsapi.OrderCancelReson8, OrderCancelCode: fnpsapi.OrderCancelReson8,
OrderCancelTime: time.Now().UnixNano() / 1e6, OrderCancelTime: time.Now().UnixNano() / 1e6,
}) })
@@ -114,6 +114,19 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
params.ChannelOrderCode = order.VendorOrderID params.ChannelOrderCode = order.VendorOrderID
} }
err = api.FnAPI.CreateOrder(params) err = api.FnAPI.CreateOrder(params)
if err == nil {
bill = &model.Waybill{
VendorOrderID: order.VendorOrderID,
OrderVendorID: order.VendorID,
VendorWaybillID: "",
VendorWaybillID2: "",
WaybillVendorID: model.VendorIDFengNiao,
DesiredFee: deliveryFee,
}
delivery.OnWaybillCreated(bill)
} else {
globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, error:%v", order.VendorOrderID, params, err)
}
} }
return bill, err return bill, err
} }
@@ -148,7 +161,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
func OnWaybillMsg(msg *fnpsapi.WayBillInfo) { func OnWaybillMsg(msg *fnpsapi.WayBillInfo) {
order := &model.Waybill{ order := &model.Waybill{
VendorWaybillID: msg.PartnerOrderCode, VendorWaybillID: msg.OpenOrderCode,
VendorWaybillID2: msg.PartnerOrderCode, VendorWaybillID2: msg.PartnerOrderCode,
WaybillVendorID: model.VendorIDFengNiao, WaybillVendorID: model.VendorIDFengNiao,
CourierName: msg.CarrierDriverName, CourierName: msg.CarrierDriverName,

7
controllers/fn_callback.go
View File

@@ -3,6 +3,10 @@ package controllers
import ( import (
"net/http" "net/http"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/business/partner/delivery/fn" "git.rosy.net.cn/jx-callback/business/partner/delivery/fn"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
@@ -16,8 +20,9 @@ type FnController struct {
func (c *FnController) Msg() { func (c *FnController) Msg() {
if c.Ctx.Input.Method() == http.MethodPost { if c.Ctx.Input.Method() == http.MethodPost {
msg := api.FnAPI.GetOrderCallbackMsg(c.Ctx.Request) msg := api.FnAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
if msg != nil { if msg != nil {
globals.SugarLogger.Debugf("%v", string(utils.MustMarshal(msg)))
fn.OnWaybillMsg(msg) fn.OnWaybillMsg(msg)
} }
c.Data["json"] = "" c.Data["json"] = ""