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

修改抖音回传率

Browse Source
This commit is contained in:
邹宗楠
2023-12-26 14:17:17 +08:00
parent b5ccc6e98a
commit cc6a6c3c03
4 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/misc/misc.go
View File

@@ -219,7 +219,7 @@ func Init() {
// 每五分钟轮询一次推送骑手信息坐标给美团/抖音 (真的订单)[抖音建议小于六十秒] // 每五分钟轮询一次推送骑手信息坐标给美团/抖音 (真的订单)[抖音建议小于六十秒]
ScheduleTimerFuncByInterval(func() { ScheduleTimerFuncByInterval(func() {
delivery.GetOrderRiderInfoToPlatform("", 0) delivery.GetOrderRiderInfoToPlatform("", 0)
}, 10*time.Second, 2*time.Minute) }, 10*time.Second, 4*time.Minute)
// (自动发单拣货,设置骑手) 刷单用 // (自动发单拣货,设置骑手) 刷单用
//ScheduleTimerFuncByInterval(func() { //ScheduleTimerFuncByInterval(func() {

7
business/partner/delivery/rider.go
View File

@@ -97,11 +97,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
//3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。 //3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。
//4.如订单已完成、已取消等状态发货将失败。 //4.如订单已完成、已取消等状态发货将失败。
for _, v := range orders { for _, v := range orders {
// 非三方配送订单不同步消息
//if v.WaybillVendorID < 100 {
// continue
//}
if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
waybillList, _ := dao.GetWaybills(db, v.VendorOrderID, nil) waybillList, _ := dao.GetWaybills(db, v.VendorOrderID, nil)
if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin {
@@ -125,6 +120,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
continue continue
} }
} }
}
} else { } else {
fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL, model.VendorIDUnknown}) fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL, model.VendorIDUnknown})
if err != nil || len(fakeWayBill) != model.YES { if err != nil || len(fakeWayBill) != model.YES {
@@ -141,7 +137,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
} }
makeRiderInfo(fakeWayBill[0], riderInfo) makeRiderInfo(fakeWayBill[0], riderInfo)
} }
}
if wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 if wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送
riderInfo.OrderId = v.VendorOrderID riderInfo.OrderId = v.VendorOrderID

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

@@ -275,7 +275,6 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
} }
refundProductList = append(refundProductList, refundProduct) refundProductList = append(refundProductList, refundProduct)
} }
globals.SugarLogger.Debugf("========parna :;= %s", utils.Format4Output(param, false))
if approveType == partner.AfsApproveTypeRefused { if approveType == partner.AfsApproveTypeRefused {
if reason == "" { if reason == "" {

31
business/partner/purchase/tiktok_store/order_afs.go
View File

@@ -7,7 +7,6 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"strings" "strings"
) )
@@ -113,22 +112,32 @@ var (
// AgreeOrRefuseRefund todo 审核售后单申请 退货退款(同意退货,确认收货之后会自动退款) 审核售后有点问题 // AgreeOrRefuseRefund todo 审核售后单申请 退货退款(同意退货,确认收货之后会自动退款) 审核售后有点问题
func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) { func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
if globals.EnableDdStoreWrite { tiktokApi := getAPI(order.VendorOrgCode, order.JxStoreID, "")
//afsOrderDetail, err := tiktokApi.QueryAfsOrderDetail(order.AfsOrderID, false)
//if err != nil {
// return err
//}
if approveType == partner.AfsApproveTypeRefused { // 拒绝退货 if approveType == partner.AfsApproveTypeRefused { // 拒绝退货
//switch afsOrderDetail.Data.ProcessInfo.AfterSaleInfo.AfterSaleType {
//case :
//
//}
errList := make([]string, 0, 0) errList := make([]string, 0, 0)
// 拒绝退款 // 拒绝退款
if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
errList = append(errList, err.Error()) errList = append(errList, err.Error())
} else { } else {
return nil return nil
} }
if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
errList = append(errList, err.Error()) errList = append(errList, err.Error())
} else { } else {
return nil return nil
} }
if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
errList = append(errList, err.Error()) errList = append(errList, err.Error())
} else { } else {
return nil return nil
@@ -139,31 +148,27 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
return fmt.Errorf("%s", strings.Join(errList, "--")) return fmt.Errorf("%s", strings.Join(errList, "--"))
} else if approveType == partner.AfsApproveTypeRefund { // 同意 } else if approveType == partner.AfsApproveTypeRefund { // 同意
errList := make([]string, 0, 0) errList := make([]string, 0, 0)
if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
errList = append(errList, err.Error()) errList = append(errList, err.Error())
} else { } else {
return nil return nil
} }
// 同意仅退款 // 同意仅退款
if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
errList = append(errList, err.Error()) errList = append(errList, err.Error())
} else { } else {
return nil return nil
} }
if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
errList = append(errList, err.Error()) errList = append(errList, err.Error())
} else { } else {
return nil return nil
} }
return fmt.Errorf("%s", strings.Join(errList, "--")) return fmt.Errorf("%s", strings.Join(errList, "--"))
if len(errList) < 3 {
return nil
}
} else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { // 退货转退款 } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { // 退货转退款
err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuReturnGoodsToRefundApply, order.AfsOrderID, "退货转退款", utils.Str2Int64(order.VendorStoreID)) err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuReturnGoodsToRefundApply, order.AfsOrderID, "退货转退款", utils.Str2Int64(order.VendorStoreID))
}
} }
return err return err
} }