diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index fbea60828..61c6fc604 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -65,6 +65,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve VendorOrderID: utils.Int64ToStr(vendorOrderID), VendorID: model.VendorIDTaoVegetable, VendorStoreID: vendorStoreID, + VendorOrderID2: *orderDetail.OutOrderId, StoreID: utils.Str2Int(*orderDetail.StoreId), JxStoreID: utils.Str2Int(*orderDetail.StoreId), CoordinateType: model.CoordinateTypeMars, diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index a5f0c897a..d4511e1e9 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -28,7 +28,8 @@ var ( func (c *PurchaseHandler) isAfsMsg(orderStatus string, orderId string) bool { if orderStatus == tao_vegetable.OrderStatusApplyAfs || orderStatus == tao_vegetable.OrderStatusCancelAfs || orderStatus == tao_vegetable.OrderStatusRefundSuccess { - order, _ := partner.CurOrderManager.LoadOrder(orderId, model.VendorIDTaoVegetable) + // order, _ := partner.CurOrderManager.LoadOrder(orderId, model.VendorIDTaoVegetable) + order, _ := partner.CurOrderManager.LoadOrder2(orderId, model.VendorIDTaoVegetable) if order != nil { return true } @@ -192,7 +193,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{}) } switch status { - case tao_vegetable.OrderStatusApplyAfs: + case tao_vegetable.OrderStatusApplyAfs: // 用户申请售后 refundData := msg.(*tao_vegetable.UserApplyRefundCallBack) orderStatus.RefVendorOrderID = refundData.OutOrderId orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusApplyAfs, "用户申请取消") @@ -200,7 +201,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{}) orderStatus.StatusTime = time.Now() orderStatus.Remark = refundData.Remarks orderStatus.VendorOrderID = refundData.BizRefundId - case tao_vegetable.OrderStatusCancelAfs: + case tao_vegetable.OrderStatusCancelAfs: // 用户取消售后 refundData := msg.(*tao_vegetable.UserCancelRefundApply) orderStatus.RefVendorOrderID = refundData.OutOrderId orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusCancelAfs, "用户取消售后申请") @@ -214,7 +215,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{}) // orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusOnSaleCancel) // orderStatus.StatusTime = utils.Str2Time(refundData.Timestamp) // orderStatus.VendorOrderID = refundData.IdempotentId - case tao_vegetable.OrderStatusRefundSuccess: + case tao_vegetable.OrderStatusRefundSuccess: // 售后成功 refundData := msg.(*tao_vegetable.RefundOrderFinish) orderStatus.RefVendorOrderID = refundData.OutMainRefundId orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusRefundSuccess, "用户售后退款成功") @@ -222,7 +223,10 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{}) orderStatus.StatusTime = time.Now() orderStatus.VendorOrderID = refundData.BizSubRefundId } - + order, _ := partner.CurOrderManager.LoadOrder2(orderStatus.RefVendorOrderID, model.VendorIDTaoVegetable) + if order != nil { + orderStatus.RefVendorOrderID = order.VendorOrderID + } if orderStatus.VendorOrderID == "" { orderStatus.VendorOrderID = orderStatus.RefVendorOrderID }