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:
邹宗楠
2024-12-04 09:15:05 +08:00
parent f66b3ff1c9
commit 36a0ae7b6f
12 changed files with 229 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/delivery/mtps/waybill.go
View File

@@ -224,7 +224,7 @@ func (c *DeliveryHandler) pushToGy(msg *mtpsapi.CallbackOrderMsg, serverType str
return
}
case model.ServerTypePet:
request, err = http.NewRequest(http.MethodPost, "http://callback-jxpet.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(params).Encode()))
if err != nil {
return
}

4
business/partner/delivery/sfps/waybill.go
View File

@@ -494,11 +494,11 @@ func pushCallbackToGy(urlIndex string, msg interface{}, serverType string) {
} else if serverType == model.ServerTypePet {
switch urlIndex {
case sfps2.UrlIndexRiderException:
request, err = http.NewRequest(http.MethodPost, "http://callback-jxpet.jxc4.com/SFPS/SfAbnormal", strings.NewReader(string(b)))
request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/SFPS/SfAbnormal", strings.NewReader(string(b)))
default:
//fullUrl := utils.GenerateGetURL("http://callback-jxgy.jxc4.com/SFPS/SfOrder", "", map[string]interface{}{"sign": sign})
//request, err = http.NewRequest(http.MethodPost, fullUrl, strings.NewReader(string(b)))
request, err = http.NewRequest(http.MethodPost, "http://callback-jxpet.jxc4.com/SFPS/SfOrder", strings.NewReader(string(b)))
request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/SFPS/SfOrder", strings.NewReader(string(b)))
}
}

8
business/partner/purchase/ebai/order_afs.go
View File

@@ -109,6 +109,12 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
if afsOrder != nil {
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
}
} else if afsOrder2 == nil && msg.Cmd == ebaiapi.CmdOrderUserCancel {
// 暂时未找到消息api
afsOrder, _ := c.makeAfsOrderInfoMerchantAgreed(msg, orderStatus)
if afsOrder != nil {
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
}
} else {
err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus)
}
@@ -116,7 +122,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
// 只有有售后订单就更新此订单的结算信息
var db = dao.GetDB()
if (msg.Cmd == ebaiapi.CmdOrderPartRefund && utils.Str2Int(orderStatus.VendorStatus) == ebaiapi.OrderPartRefundSuccess) || (msg.Cmd == ebaiapi.CmdOrderReversePush && utils.Str2Int(orderStatus.VendorStatus) == ebaiapi.OrderReversePushApplySuccess) {
if (msg.Cmd == ebaiapi.CmdOrderUserCancel && orderStatus.Status == model.AfsOrderStatusFinished) || (msg.Cmd == ebaiapi.CmdOrderPartRefund && utils.Str2Int(orderStatus.VendorStatus) == ebaiapi.OrderPartRefundSuccess) || (msg.Cmd == ebaiapi.CmdOrderReversePush && utils.Str2Int(orderStatus.VendorStatus) == ebaiapi.OrderReversePushApplySuccess) {
orderData, err2 := api.EbaiAPI.OrderPartRefundGet(orderStatus.RefVendorOrderID)
if err2 == nil && utils.MustInterface2Int64(orderData["merchant_income"]) != model.NO {
goodsOrder, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDEBAI)

47
business/partner/purchase/ebai/order_afs_ex.go
View File

@@ -90,3 +90,50 @@ func (c *PurchaseHandler) makeAfsOrderInfoReverseRefund(msg *ebaiapi.CallbackMsg
}
return afsOrder, nil
}
func (c *PurchaseHandler) makeAfsOrderInfoMerchantAgreed(msg *ebaiapi.CallbackMsg, orderStatus *model.OrderStatus) (*model.AfsOrder, error) {
var afsOrder *model.AfsOrder
partRefundData := msg.Data.(*ebaiapi.CBUserCancelInfo)
afsOrder = &model.AfsOrder{
VendorID: model.VendorIDEBAI,
AfsOrderID: orderStatus.VendorOrderID,
VendorOrderID: orderStatus.RefVendorOrderID,
VendorStoreID: utils.Int2Str(partRefundData.PlatformShopId),
StoreID: 0,
AfsCreatedAt: utils.Timestamp2Time(msg.Timestamp),
VendorAppealType: "",
AppealType: model.AfsAppealTypeRefund,
VendorReasonType: utils.Int2Str(partRefundData.ReasonCode),
ReasonType: c.convertAfsReasonType(utils.Int2Str(partRefundData.ReasonCode)),
ReasonDesc: utils.LimitUTF8StringLen(partRefundData.CancelReason, 1024),
ReasonImgList: utils.LimitUTF8StringLen(strings.Join(partRefundData.Pictures, ","), 1024),
RefundType: model.AfsTypePartRefund,
VendorOrgCode: msg.Source,
}
// 查询售后列表
refundSku, _, err := api.EbaiAPI.GetReverseOrder(orderStatus.RefVendorOrderID)
if err == nil {
refundSkuList := make([]*ebaiapi.ReverseSkuList, 0, len(refundSku))
refundByte, _ := json.Marshal(refundSku)
if err = json.Unmarshal(refundByte, &refundSkuList); err != nil {
return nil, err
}
for _, sku := range refundSkuList {
if sku.SkuName == "配送费" || sku.SkuName == "包装费" {
continue
}
orderSku := &model.OrderSkuFinancial{
Count: sku.RefundQuantity,
VendorSkuID: utils.Int64ToStr(sku.PlatformSkuId),
SkuID: utils.Str2Int(sku.CustomSkuId),
Name: sku.SkuName,
UserMoney: int64(sku.RefundUserAmount),
PmSkuSubsidyMoney: int64(sku.DiscountDetail.PlatformDiscountAmount),
}
afsOrder.SkuUserMoney += orderSku.UserMoney
afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney
afsOrder.Skus = append(afsOrder.Skus, orderSku)
}
}
return afsOrder, nil
}

2
business/partner/purchase/mtwm/callback.go
View File

@@ -111,7 +111,7 @@ func pushIMToGyOrPet(msg *mtwmapi.ImCallbackMsg, serverType string) {
return
}
case model.ServerTypePet:
request, err = http.NewRequest(http.MethodPost, "http://callback-jxpet.jxc4.com/mtwm/iMCallback", strings.NewReader(utils.Map2URLValues(params).Encode()))
request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/mtwm/iMCallback", strings.NewReader(utils.Map2URLValues(params).Encode()))
if err != nil {
return
}

10
business/partner/purchase/tiktok_store/callback.go
View File

@@ -116,15 +116,15 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string, serverType
} else if serverType == model.ServerTypePet {
switch requestType {
case CaiShiPushGyTagOrder: // 订单相关
url = "http://callback-jxpet.jxc4.com/tiktok/callbackTiktokOrderMsg"
url = "http://callback-gblm.jxc4.com/tiktok/callbackTiktokOrderMsg"
case CaiShiPushGyTagToken: // 授权相关
url = "http://callback-jxpet.jxc4.com/tiktokShop/jxcsToGyTiktokToken"
url = "http://callback-gblm.jxc4.com/tiktokShop/jxcsToGyTiktokToken"
case CaiShiPushGyTagDeliveryRegister: // 配送查询注册
url = "http://callback-jxpet.jxc4.com/logistics/logisticsRegister"
url = "http://callback-gblm.jxc4.com/logistics/logisticsRegister"
case CaiShiPushGyTagDeliveryDetail: // 配送查询详情
url = "http://callback-jxpet.jxc4.com/logistics/logisticsQuery"
url = "http://callback-gblm.jxc4.com/logistics/logisticsQuery"
case CaiShiPushGyTagWayBill: // 运单消息
url = "http://callback-jxpet.jxc4.com/tiktok/callbackTiktokOrderMsg"
url = "http://callback-gblm.jxc4.com/tiktok/callbackTiktokOrderMsg"
}
}