1
This commit is contained in:
@@ -105,9 +105,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
|
||||
InvoiceEmail: "",
|
||||
VendorOrgCode: vendorOrgCode,
|
||||
}
|
||||
// 本地获取订单记录
|
||||
orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID)
|
||||
order.OrderSeq = orderSeq + 1
|
||||
|
||||
if result.FinishTime != 0 {
|
||||
order.OrderFinishedAt = getTimeFromTimestamp(result.FinishTime)
|
||||
@@ -213,6 +210,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
|
||||
v.IsVendorAct = model.YES
|
||||
}
|
||||
}
|
||||
|
||||
// 本地获取订单记录
|
||||
orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID)
|
||||
order.OrderSeq = orderSeq + 1
|
||||
|
||||
jxutils.RefreshOrderSkuRelated(order)
|
||||
return order, orderMap, nil
|
||||
}
|
||||
@@ -594,12 +596,7 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// 呼叫骑手
|
||||
err = c.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, map[string]interface{}{
|
||||
"third_carrier_order_id": order.VendorOrderID,
|
||||
"opcode": tiktokShop.TiktokLogisticsStatusCALLRIDER,
|
||||
"logistics_context": "商家呼叫骑手",
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -631,13 +628,6 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
|
||||
return err
|
||||
}
|
||||
|
||||
// 呼叫骑手
|
||||
err = c.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, map[string]interface{}{
|
||||
"third_carrier_order_id": order.VendorOrderID,
|
||||
"opcode": tiktokShop.TiktokLogisticsStatusCALLRIDER,
|
||||
"logistics_context": "商家呼叫骑手",
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user