1
This commit is contained in:
@@ -445,6 +445,7 @@ func filterOrderInfo(order *model.GoodsOrder) {
|
||||
}
|
||||
|
||||
func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder) (err error) {
|
||||
globals.SugarLogger.Debugf("=================取消本地运费")
|
||||
if db == nil {
|
||||
db = dao.GetDB()
|
||||
}
|
||||
@@ -468,6 +469,8 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder) (err error) {
|
||||
|
||||
isRefund := true // 默认可以退费
|
||||
for _, v := range orderStatusList {
|
||||
globals.SugarLogger.Debug("=================营业时间未到取消订单1", v.VendorOrderID, v.RefVendorOrderID)
|
||||
|
||||
if order.WaybillVendorID == model.VendorIDMTPS && v.VendorStatus == "30" {
|
||||
isRefund = false
|
||||
break
|
||||
|
||||
@@ -240,6 +240,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c
|
||||
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
|
||||
if err = utils.CallFuncLogErrorWithInfo(func() error {
|
||||
if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil {
|
||||
globals.SugarLogger.Debug("=================正儿八经去平台取消订单")
|
||||
order, _ := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID)
|
||||
orderman.ResetCreateWaybillFee(nil, order)
|
||||
}
|
||||
|
||||
@@ -814,6 +814,7 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde
|
||||
time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())
|
||||
time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now())
|
||||
if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(time.Minute*30)) > 0 {
|
||||
globals.SugarLogger.Debug("不在营业时间范围内取消订单")
|
||||
s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonNotInStoreOpenTime)
|
||||
//s.reverseBrandAccount(storeDetail, bill)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user