diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index fced88465..78cf28e38 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -134,7 +134,7 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i // 城市维度获取顺丰门店id if len(store.CityName) > 0 { 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 { param.ShopId = v 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) { + 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 { return err } bill.Status = model.WaybillStatusCanceled bill.Remark = cancelReason + bill.DesiredFee = money //取消成功才赋值违约金 partner.CurOrderManager.OnWaybillStatusChanged(bill) return nil } @@ -252,7 +259,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo // 城市维度获取顺丰门店id if len(store.CityName) > 0 { 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 { param.ShopId = v flag = true