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

dyps update

Browse Source
This commit is contained in:
richboo111
2023-01-09 13:48:35 +08:00
parent 27c3042d85 68b5033815
commit 6c447d01fa
22 changed files with 400 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/partner/delivery/tiktok_store/waybill.go
View File

@@ -62,8 +62,12 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
VendorStoreID: utils.Int64ToStr(storeInfo.StoreDetail.Store.StoreId),
CourierStatus: int(storeInfo.StoreDetail.Store.State),
}
<<<<<<< HEAD
=======
} else {
globals.SugarLogger.Debugf("GetStoreDetail err %s", err)
>>>>>>> 68b5033815cd812e1d9516b5f64acfab2665ee94
}
globals.SugarLogger.Debugf("DYPS GetStore storeDetail====%s", utils.Format4Output(storeDetail, false))
return storeDetail, err
}
@@ -114,7 +118,6 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
bill.Remark = cancelReason
partner.CurOrderManager.OnWaybillStatusChanged(bill)
}
globals.SugarLogger.Debugf("DYPS CancelWaybill bill.Status=%d err=%v", bill.Status, err)
return err
}
@@ -127,7 +130,6 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
deliveryFeeInfo = &partner.WaybillFeeInfo{}
deliveryFeeInfo.DeliveryFee = dispatcherFee
}
globals.SugarLogger.Debugf("DYPS GetWaybillFee deliveryFeeInfo======%s", utils.Format4Output(deliveryFeeInfo, false))
return deliveryFeeInfo, err
}
func getDispatcherFee(storeID int64, vendorOrderID string, dispatcherType int32) int64 {