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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-09-04 13:59:08 +08:00
parent 19224dfbb0 a235007153
commit 8097029ea5
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -143,10 +143,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel) err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel)
partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", "抖音骑手已经接单,无法取消") partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", "抖音骑手已经接单,无法取消")
return err return err
} } else if tiktokWayBillStatus == -1 { // 先转自送,自送不成功取消平台配送.
// 先转自送,自送不成功取消平台配送.
if tiktokWayBillStatus == -1 {
if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil { if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1") partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1")
} }

7
business/partner/purchase/ebai/order.go
View File

@@ -662,7 +662,6 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
ReverseOrderId: "", ReverseOrderId: "",
OrderId: order.VendorOrderID, OrderId: order.VendorOrderID,
IdempotentId: utils.Int64ToStr(time.Now().UnixNano()), IdempotentId: utils.Int64ToStr(time.Now().UnixNano()),
ActionType: ebaiapi.RefundTypeRefuse,
ReasonRemarks: reason, ReasonRemarks: reason,
} }
refundProductList := make([]*ebaiapi.RefundProductList, 0, 0) refundProductList := make([]*ebaiapi.RefundProductList, 0, 0)
@@ -670,7 +669,7 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
for _, v := range date { for _, v := range date {
v2 := v.(map[string]interface{}) v2 := v.(map[string]interface{})
refundProduct := &ebaiapi.RefundProductList{ 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)), PlatformSkuId: utils.Int64ToStr(utils.Interface2Int64WithDefault(v2["platform_sku_id"], 0)),
} }
switch utils.MustInterface2Int64(v2["fund_calculate_type"]) { switch utils.MustInterface2Int64(v2["fund_calculate_type"]) {
@@ -681,18 +680,20 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
} }
refundProductList = append(refundProductList, refundProduct) refundProductList = append(refundProductList, refundProduct)
if param.ReverseOrderId == "" { if param.ReverseOrderId == "" {
param.ReverseOrderId = v2["refund_order_id"].(string) param.ReverseOrderId = utils.Int64ToStr(utils.Interface2Int64WithDefault(v2["refund_order_id"], 0))
} }
} }
param.RefundProductList = refundProductList param.RefundProductList = refundProductList
if isAcceptIt { if isAcceptIt {
param.ActionType = ebaiapi.RefundTypeAgree
err = api.EbaiAPI.OrderAgreeRefund(param) err = api.EbaiAPI.OrderAgreeRefund(param)
} else { } else {
if reason == "" { if reason == "" {
return fmt.Errorf("拒绝退单时,请填写拒单原因") return fmt.Errorf("拒绝退单时,请填写拒单原因")
} }
param.ReasonCode = "7001" param.ReasonCode = "7001"
param.ActionType = ebaiapi.RefundTypeRefuse
err = api.EbaiAPI.OrderDisagreeRefund(param) err = api.EbaiAPI.OrderDisagreeRefund(param)
} }
} }

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

@@ -498,6 +498,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
// PickupGoods 拣货 // PickupGoods 拣货
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
var err2 error
if isSelfDelivery { if isSelfDelivery {
param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp) param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
if err != nil { if err != nil {
@@ -505,16 +506,17 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
} }
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
err = api.DeliveryFinish(param) err = api.DeliveryFinish(param)
if err != nil && strings.Contains(err.Error(), "并发操作，执行失败，请重试") { if err != nil && strings.Contains(err.Error(), "并发操作，执行失败，请重试") {
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
api.DeliveryFinish(param) err2 = api.DeliveryFinish(param)
} else if err != nil { } else if err != nil {
return err return err
} }
if err != nil && err2 != nil {
c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp) c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
} }
}
return err return err
} }