From bf6c68930c80392e10881652bf40921db8be5cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 21 Dec 2020 10:42:37 +0800
Subject: [PATCH] fnps

---
 business/partner/delivery/fn/waybill.go | 17 +++++++++++++++--
 controllers/fn_callback.go              |  7 ++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go
index 33e05285c..321c98dd0 100644
--- a/business/partner/delivery/fn/waybill.go
+++ b/business/partner/delivery/fn/waybill.go
@@ -41,7 +41,7 @@ func (c *DeliveryHandler) GetVendorID() int {
 func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
 	err = api.FnAPI.CancelOrder(&fnpsapi.CancelOrderParam{
 		PartnerOrderCode:      bill.VendorOrderID,
-		OrderCancelReasonCode: 1, //用户取消
+		OrderCancelReasonCode: 2, //用户取消
 		OrderCancelCode:       fnpsapi.OrderCancelReson8,
 		OrderCancelTime:       time.Now().UnixNano() / 1e6,
 	})
@@ -114,6 +114,19 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 			params.ChannelOrderCode = order.VendorOrderID
 		}
 		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
 }
@@ -148,7 +161,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 
 func OnWaybillMsg(msg *fnpsapi.WayBillInfo) {
 	order := &model.Waybill{
-		VendorWaybillID:  msg.PartnerOrderCode,
+		VendorWaybillID:  msg.OpenOrderCode,
 		VendorWaybillID2: msg.PartnerOrderCode,
 		WaybillVendorID:  model.VendorIDFengNiao,
 		CourierName:      msg.CarrierDriverName,
diff --git a/controllers/fn_callback.go b/controllers/fn_callback.go
index 49d929417..f669ef187 100644
--- a/controllers/fn_callback.go
+++ b/controllers/fn_callback.go
@@ -3,6 +3,10 @@ package controllers
 import (
 	"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/globals/api"
@@ -16,8 +20,9 @@ type FnController struct {
 
 func (c *FnController) Msg() {
 	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 {
+			globals.SugarLogger.Debugf("%v", string(utils.MustMarshal(msg)))
 			fn.OnWaybillMsg(msg)
 		}
 		c.Data["json"] = ""