diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go index 04926fc69..e7716e690 100644 --- a/controllers/taobao_vegetable.go +++ b/controllers/taobao_vegetable.go @@ -10,7 +10,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" taoVegetable "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "io/ioutil" @@ -225,20 +224,14 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() { return } default: - //callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder) - //c.Data["json"] = callbackResponse order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), model.VendorIDTaoVegetable) - globals.SugarLogger.Debugf("=========afsOrder:= %s", utils.Format4Output(afsOrder, false)) - globals.SugarLogger.Debugf("=========order:= %s", utils.Format4Output(order, false)) - globals.SugarLogger.Debugf("=========order:= %v", err) - if err != nil || order.Status >= model.OrderStatusDelivering { - c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消")) - c.ServeJSON() - } else { + if err != nil || order.Status < model.OrderStatusDelivering || order.Status == model.OrderStatusCanceled { c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(nil) c.ServeJSON() + } else { + c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消")) + c.ServeJSON() } - return } }