删除打印
This commit is contained in:
@@ -967,7 +967,6 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
|
|||||||
if v.Status < model.WaybillStatusEndBegin &&
|
if v.Status < model.WaybillStatusEndBegin &&
|
||||||
!model.IsWaybillPlatformOwn(v) &&
|
!model.IsWaybillPlatformOwn(v) &&
|
||||||
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
|
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
|
||||||
fmt.Println("111111111111========cancel_Order", 1)
|
|
||||||
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
|
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
|
||||||
if err2 == nil {
|
if err2 == nil {
|
||||||
// 在这里就从map里删除,而不是等收到运单结束事件才删除,可避免不必要的重复取消(第二次取消还会失败)
|
// 在这里就从map里删除,而不是等收到运单结束事件才删除,可避免不必要的重复取消(第二次取消还会失败)
|
||||||
|
|||||||
@@ -67,7 +67,6 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
|
|||||||
OrderCancelRole: 2,
|
OrderCancelRole: 2,
|
||||||
}
|
}
|
||||||
parameter.PartnerOrderCode = bill.VendorOrderID
|
parameter.PartnerOrderCode = bill.VendorOrderID
|
||||||
fmt.Println("===============cancle", 3333)
|
|
||||||
if err = api.FnAPI.CancelOrder(parameter); err != nil {
|
if err = api.FnAPI.CancelOrder(parameter); err != nil {
|
||||||
if strings.Contains(err.Error(), "运单暂未生成") {
|
if strings.Contains(err.Error(), "运单暂未生成") {
|
||||||
err = nil
|
err = nil
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package controllers
|
package controllers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"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"
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
@@ -16,10 +15,7 @@ type FnController struct {
|
|||||||
// 门店回掉
|
// 门店回掉
|
||||||
func (c *FnController) FnStore() {
|
func (c *FnController) FnStore() {
|
||||||
if c.Ctx.Input.Method() == http.MethodPost {
|
if c.Ctx.Input.Method() == http.MethodPost {
|
||||||
fmt.Println("开始回调门店回掉==========================")
|
|
||||||
msg, callbackResponse := api.FnAPI.GetChainstoreStatusNotify(c.Ctx.Request)
|
msg, callbackResponse := api.FnAPI.GetChainstoreStatusNotify(c.Ctx.Request)
|
||||||
fmt.Println("开始回调门店回掉==========================msg", msg)
|
|
||||||
fmt.Println("开始回调门店回掉==========================callbackResponse", callbackResponse)
|
|
||||||
if callbackResponse.Code == -1 {
|
if callbackResponse.Code == -1 {
|
||||||
c.Data["code"] = callbackResponse
|
c.Data["code"] = callbackResponse
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
@@ -37,10 +33,7 @@ func (c *FnController) FnStore() {
|
|||||||
// 订单状态
|
// 订单状态
|
||||||
func (c *FnController) FnOrder() {
|
func (c *FnController) FnOrder() {
|
||||||
if c.Ctx.Input.Method() == http.MethodPost {
|
if c.Ctx.Input.Method() == http.MethodPost {
|
||||||
fmt.Println("开始回调订单状态==========================")
|
|
||||||
msg, callbackResponse := api.FnAPI.GetChainOrderStatusNotify(c.Ctx.Request)
|
msg, callbackResponse := api.FnAPI.GetChainOrderStatusNotify(c.Ctx.Request)
|
||||||
fmt.Println("开始回调订单状态==========================msg", msg)
|
|
||||||
fmt.Println("开始回调订单状态==========================callbackResponse", callbackResponse)
|
|
||||||
if callbackResponse.Code == -1 {
|
if callbackResponse.Code == -1 {
|
||||||
c.Data["code"] = callbackResponse
|
c.Data["code"] = callbackResponse
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
@@ -59,10 +52,7 @@ func (c *FnController) FnOrder() {
|
|||||||
// 异常回调
|
// 异常回调
|
||||||
func (c *FnController) FnAbnormal() {
|
func (c *FnController) FnAbnormal() {
|
||||||
if c.Ctx.Input.Method() == http.MethodPost {
|
if c.Ctx.Input.Method() == http.MethodPost {
|
||||||
fmt.Println("开始回调异常回调==========================")
|
|
||||||
msg, callbackResponse := api.FnAPI.GetChainAbnormaltatusNotify(c.Ctx.Request)
|
msg, callbackResponse := api.FnAPI.GetChainAbnormaltatusNotify(c.Ctx.Request)
|
||||||
fmt.Println("开始回调异常回调==========================msg", msg)
|
|
||||||
fmt.Println("开始回调异常回调==========================callbackResponse", callbackResponse)
|
|
||||||
if callbackResponse.Code == -1 {
|
if callbackResponse.Code == -1 {
|
||||||
c.Data["json"] = callbackResponse
|
c.Data["json"] = callbackResponse
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
|
|||||||
Reference in New Issue
Block a user