This commit is contained in:
邹宗楠
2023-11-30 16:22:33 +08:00
parent d23ba08091
commit 9cf6125a03
4 changed files with 14 additions and 7 deletions

View File

@@ -633,7 +633,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
param := &order_logisticsAdd_request.OrderLogisticsAddParam{
OrderId: order.VendorOrderID,
Company: "",
CompanyCode: "chengdouruoxi",
CompanyCode: "",
LogisticsCode: order.VendorOrderID,
IsRefundReject: false,
IsRejectRefund: false,
@@ -641,6 +641,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID),
}
param.CompanyCode = utils.JxVendorId2TiktokCode(order.WaybillVendorID)
err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
if err != nil {
return err
@@ -651,7 +652,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
ThirdCarrierOrderId: order.VendorOrderID,
CourierName: "",
CourierPhone: "",
LogisticsProviderCode: "10002",
LogisticsProviderCode: param.CompanyCode,
LogisticsStatus: 0,
LogisticsContext: "呼叫骑手,新建运单",
Latitude: "",
@@ -669,13 +670,14 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName
ThirdCarrierOrderId: order.VendorOrderID,
CourierName: "",
CourierPhone: "",
LogisticsProviderCode: utils.MyselfPsCode,
LogisticsProviderCode: "",
LogisticsStatus: 0,
LogisticsContext: "商家自配送,已送达",
Latitude: "",
Longitude: "",
Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)),
Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)),
OpCode: tiktokShop.TiktokLogisticsDELIVERED,
}
riderInfo.LogisticsProviderCode = utils.JxVendorId2TiktokCode(order.WaybillVendorID)
bills, _ := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil)
for _, v := range bills {
if v.Status == model.OrderStatusCanceled {
@@ -684,6 +686,7 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName
riderInfo.CourierName = v.CourierName
riderInfo.CourierPhone = v.CourierMobile
}
riderInfo.LogisticsProviderCode = utils.JxVendorId2TiktokCode(order.WaybillVendorID)
return c.GetOrderRider("", "", utils.Struct2MapByJson(riderInfo))
}