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

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

Browse Source
This commit is contained in:
邹宗楠
2023-08-15 10:27:55 +08:00
parent bacb4d8d5e 7f7aa132c6
commit 2967968c32
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/partner/delivery/sfps/waybill.go
View File

@@ -134,7 +134,7 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
// 城市维度获取顺丰门店id // 城市维度获取顺丰门店id
if len(store.CityName) > 0 { if len(store.CityName) > 0 {
for k, v := range sfps2.SFCityStoreIDs { for k, v := range sfps2.SFCityStoreIDs {
globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k) //globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k)
if strings.Contains(store.CityName, k) || store.CityName == k { if strings.Contains(store.CityName, k) || store.CityName == k {
param.ShopId = v param.ShopId = v
flag = true flag = true
@@ -204,11 +204,18 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
} }
func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
money := int64(0)
deductionFee, err := api.SfPsAPI.PreCancelOrder(bill.VendorWaybillID)
if deductionFee == 0 || err != nil {
money = 0
}
money = utils.Float64TwoInt64(deductionFee)
if err = api.SfPsAPI.CancelOrder(bill.VendorWaybillID); err != nil { if err = api.SfPsAPI.CancelOrder(bill.VendorWaybillID); err != nil {
return err return err
} }
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled
bill.Remark = cancelReason bill.Remark = cancelReason
bill.DesiredFee = money //取消成功才赋值违约金
partner.CurOrderManager.OnWaybillStatusChanged(bill) partner.CurOrderManager.OnWaybillStatusChanged(bill)
return nil return nil
} }
@@ -252,7 +259,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
// 城市维度获取顺丰门店id // 城市维度获取顺丰门店id
if len(store.CityName) > 0 { if len(store.CityName) > 0 {
for k, v := range sfps2.SFCityStoreIDs { for k, v := range sfps2.SFCityStoreIDs {
globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k) //globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k)
if strings.Contains(store.CityName, k) || store.CityName == k { if strings.Contains(store.CityName, k) || store.CityName == k {
param.ShopId = v param.ShopId = v
flag = true flag = true