This commit is contained in:
邹宗楠
2022-11-03 14:03:54 +08:00
parent d476311491
commit c4e65aa027

View File

@@ -318,26 +318,25 @@ func (a *API) ConfirmReceivedReturnGoods(afsOrderId int64, agree bool) {
// CancelSendGoodsSuccess 商家在未发货仅退款途中发送取消发货状态
func (a *API) CancelSendGoodsSuccess() {}
// LogisticsAdd 订单发货接口
// OrderDelivering 订单发货
// 暂时只支持整单出库,即接口调用时入参只能传父订单号。
// Tips部分发货状态下的父订单调此接口发货会报错该订单当前为“部分发货”状态无法调用此接口
// orderId主订单id,companyCode 物流公司code,isRefundReject 是否拒绝退款申请true表示拒绝退款并继续发货),addressId发货地址id
func (a *API) LogisticsAdd(orderId string, companyCode string, isRefundReject bool, addressId int64) error {
func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAddParam) error {
request := order_logisticsAdd_request.New()
request.Param = &order_logisticsAdd_request.OrderLogisticsAddParam{
OrderId: orderId,
CompanyCode: companyCode,
IsRefundReject: isRefundReject,
AddressId: addressId,
}
data, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("订单发货接口=========%s", request.GetUrlPath())
globals.SugarLogger.Debugf("订单发货接口:=%s", utils.Format4Output(data, false))
request.Param = param
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("OrderDelivering=========%s", request.GetUrlPath())
globals.SugarLogger.Debugf("OrderDelivering=========%s", utils.Format4Output(result, false))
if err != nil {
return err
}
if data.Code != RequestSuccessCode {
return errors.New(data.SubMsg)
if result.Code == RequestSuccessRepeatedShipment {
return nil
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
}
return nil
}
@@ -616,26 +615,6 @@ func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, *Callb
}
}
// OrderDelivering 订单发货
func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAddParam) error {
request := order_logisticsAdd_request.New()
request.Param = param
result, err := request.Execute(a.accessTokenObj)
globals.SugarLogger.Debugf("OrderDelivering=========%s", request.GetUrlPath())
globals.SugarLogger.Debugf("OrderDelivering=========%s", utils.Format4Output(result, false))
if err != nil {
return err
}
if result.Code == RequestSuccessRepeatedShipment {
return nil
}
if result.Code != RequestSuccessCode {
return errors.New(result.SubMsg)
}
return nil
}
// LogisticsAddSinglePack 支持多个订单发同一个物流包裹
func (a *API) LogisticsAddSinglePack() {
request := order_logisticsAddSinglePack_request.New()