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

1

Browse Source
This commit is contained in:
邹宗楠
2022-07-14 14:38:30 +08:00
parent 8d162be090
commit b1958fcee6
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/order.go
View File

@@ -445,6 +445,7 @@ func filterOrderInfo(order *model.GoodsOrder) {
} }
func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder) (err error) { func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder) (err error) {
globals.SugarLogger.Debugf("=================取消本地运费")
if db == nil { if db == nil {
db = dao.GetDB() db = dao.GetDB()
} }
@@ -468,6 +469,8 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder) (err error) {
isRefund := true // 默认可以退费 isRefund := true // 默认可以退费
for _, v := range orderStatusList { for _, v := range orderStatusList {
globals.SugarLogger.Debug("=================营业时间未到取消订单1", v.VendorOrderID, v.RefVendorOrderID)
if order.WaybillVendorID == model.VendorIDMTPS && v.VendorStatus == "30" { if order.WaybillVendorID == model.VendorIDMTPS && v.VendorStatus == "30" {
isRefund = false isRefund = false
break break

1
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -240,6 +240,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
if err = utils.CallFuncLogErrorWithInfo(func() error { if err = utils.CallFuncLogErrorWithInfo(func() error {
if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil { if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil {
globals.SugarLogger.Debug("=================正儿八经去平台取消订单")
order, _ := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID) order, _ := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID)
orderman.ResetCreateWaybillFee(nil, order) orderman.ResetCreateWaybillFee(nil, order)
} }

1
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -814,6 +814,7 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde
time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now()) time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())
time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now()) time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now())
if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(time.Minute*30)) > 0 { 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.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonNotInStoreOpenTime)
//s.reverseBrandAccount(storeDetail, bill) //s.reverseBrandAccount(storeDetail, bill)
} }