liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-04 16:41:44 +08:00
parent 47c2776059
commit e5aa44721f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/partner/purchase/tao_vegetable/order.go
View File

@@ -65,6 +65,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
VendorOrderID: utils.Int64ToStr(vendorOrderID), VendorOrderID: utils.Int64ToStr(vendorOrderID),
VendorID: model.VendorIDTaoVegetable, VendorID: model.VendorIDTaoVegetable,
VendorStoreID: vendorStoreID, VendorStoreID: vendorStoreID,
VendorOrderID2: *orderDetail.OutOrderId,
StoreID: utils.Str2Int(*orderDetail.StoreId), StoreID: utils.Str2Int(*orderDetail.StoreId),
JxStoreID: utils.Str2Int(*orderDetail.StoreId), JxStoreID: utils.Str2Int(*orderDetail.StoreId),
CoordinateType: model.CoordinateTypeMars, CoordinateType: model.CoordinateTypeMars,

14
business/partner/purchase/tao_vegetable/order_afs.go
View File

@@ -28,7 +28,8 @@ var (
func (c *PurchaseHandler) isAfsMsg(orderStatus string, orderId string) bool { func (c *PurchaseHandler) isAfsMsg(orderStatus string, orderId string) bool {
if orderStatus == tao_vegetable.OrderStatusApplyAfs || orderStatus == tao_vegetable.OrderStatusCancelAfs || orderStatus == tao_vegetable.OrderStatusRefundSuccess { 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 { if order != nil {
return true return true
} }
@@ -192,7 +193,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{})
} }
switch status { switch status {
case tao_vegetable.OrderStatusApplyAfs: case tao_vegetable.OrderStatusApplyAfs: // 用户申请售后
refundData := msg.(*tao_vegetable.UserApplyRefundCallBack) refundData := msg.(*tao_vegetable.UserApplyRefundCallBack)
orderStatus.RefVendorOrderID = refundData.OutOrderId orderStatus.RefVendorOrderID = refundData.OutOrderId
orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusApplyAfs, "用户申请取消") 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.StatusTime = time.Now()
orderStatus.Remark = refundData.Remarks orderStatus.Remark = refundData.Remarks
orderStatus.VendorOrderID = refundData.BizRefundId orderStatus.VendorOrderID = refundData.BizRefundId
case tao_vegetable.OrderStatusCancelAfs: case tao_vegetable.OrderStatusCancelAfs: // 用户取消售后
refundData := msg.(*tao_vegetable.UserCancelRefundApply) refundData := msg.(*tao_vegetable.UserCancelRefundApply)
orderStatus.RefVendorOrderID = refundData.OutOrderId orderStatus.RefVendorOrderID = refundData.OutOrderId
orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusCancelAfs, "用户取消售后申请") 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.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusOnSaleCancel)
// orderStatus.StatusTime = utils.Str2Time(refundData.Timestamp) // orderStatus.StatusTime = utils.Str2Time(refundData.Timestamp)
// orderStatus.VendorOrderID = refundData.IdempotentId // orderStatus.VendorOrderID = refundData.IdempotentId
case tao_vegetable.OrderStatusRefundSuccess: case tao_vegetable.OrderStatusRefundSuccess: // 售后成功
refundData := msg.(*tao_vegetable.RefundOrderFinish) refundData := msg.(*tao_vegetable.RefundOrderFinish)
orderStatus.RefVendorOrderID = refundData.OutMainRefundId orderStatus.RefVendorOrderID = refundData.OutMainRefundId
orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusRefundSuccess, "用户售后退款成功") 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.StatusTime = time.Now()
orderStatus.VendorOrderID = refundData.BizSubRefundId orderStatus.VendorOrderID = refundData.BizSubRefundId
} }
order, _ := partner.CurOrderManager.LoadOrder2(orderStatus.RefVendorOrderID, model.VendorIDTaoVegetable)
if order != nil {
orderStatus.RefVendorOrderID = order.VendorOrderID
}
if orderStatus.VendorOrderID == "" { if orderStatus.VendorOrderID == "" {
orderStatus.VendorOrderID = orderStatus.RefVendorOrderID orderStatus.VendorOrderID = orderStatus.RefVendorOrderID
} }