From 5e1fdb336828dc8ccd427ff9fa33ef4d2af9f738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 1 Sep 2023 19:59:07 +0800 Subject: [PATCH 1/4] 1 --- business/partner/purchase/ebai/order.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index c9744fa8b..c09b28548 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -662,7 +662,6 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod ReverseOrderId: "", OrderId: order.VendorOrderID, IdempotentId: utils.Int64ToStr(time.Now().UnixNano()), - ActionType: ebaiapi.RefundTypeRefuse, ReasonRemarks: reason, } refundProductList := make([]*ebaiapi.RefundProductList, 0, 0) @@ -687,12 +686,14 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod param.RefundProductList = refundProductList if isAcceptIt { + param.ActionType = ebaiapi.RefundTypeAgree err = api.EbaiAPI.OrderAgreeRefund(param) } else { if reason == "" { return fmt.Errorf("拒绝退单时,请填写拒单原因") } param.ReasonCode = "7001" + param.ActionType = ebaiapi.RefundTypeRefuse err = api.EbaiAPI.OrderDisagreeRefund(param) } } From 3377e21331e1f300d43311c9ef27bdef14c2c06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 1 Sep 2023 20:15:07 +0800 Subject: [PATCH 2/4] 1 --- business/partner/purchase/ebai/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index c09b28548..2759d5244 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -669,7 +669,7 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod for _, v := range date { v2 := v.(map[string]interface{}) refundProduct := &ebaiapi.RefundProductList{ - SubBizOrderId: v2["sub_biz_order_id"].(string), + SubBizOrderId: utils.Interface2String(v2["sub_biz_order_id"]), PlatformSkuId: utils.Int64ToStr(utils.Interface2Int64WithDefault(v2["platform_sku_id"], 0)), } switch utils.MustInterface2Int64(v2["fund_calculate_type"]) { From 67669bec47f3a910edfb9b6e163454f1f35a3372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 1 Sep 2023 20:17:36 +0800 Subject: [PATCH 3/4] 1 --- business/partner/purchase/ebai/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 2759d5244..7d3b69e5d 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -680,7 +680,7 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod } refundProductList = append(refundProductList, refundProduct) if param.ReverseOrderId == "" { - param.ReverseOrderId = v2["refund_order_id"].(string) + param.ReverseOrderId = utils.Int64ToStr(utils.Interface2Int64WithDefault(v2["refund_order_id"], 0)) } } param.RefundProductList = refundProductList From a2350071532cf41f66aacdd3d42dcdb6a4b1b4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 4 Sep 2023 10:44:19 +0800 Subject: [PATCH 4/4] 1 --- business/jxcallback/scheduler/basesch/basesch.go | 5 +---- business/partner/purchase/tao_vegetable/order.go | 8 +++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index d6c44c614..c81c6744a 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -143,10 +143,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel) partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", "抖音骑手已经接单,无法取消") return err - } - - // 先转自送,自送不成功取消平台配送. - if tiktokWayBillStatus == -1 { + } else if tiktokWayBillStatus == -1 { // 先转自送,自送不成功取消平台配送. if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil { partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1") } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 546392265..c006cdd1a 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -498,6 +498,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI // PickupGoods 拣货 func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { + var err2 error if isSelfDelivery { param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp) if err != nil { @@ -505,15 +506,16 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo } api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") err = api.DeliveryFinish(param) - if err != nil && strings.Contains(err.Error(), "并发操作，执行失败，请重试") { time.Sleep(200 * time.Millisecond) - api.DeliveryFinish(param) + err2 = api.DeliveryFinish(param) } else if err != nil { return err } - c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp) + if err != nil && err2 != nil { + c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp) + } } return err }