diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index d3dd75161..649fa3f93 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -743,11 +743,11 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now()) time2 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now()) - if time.Now().Sub(time1) < 0 || time.Now().Sub(time2.Add(time.Hour)) > 0 { + if time.Now().Sub(time1) < 0 || time.Now().Sub(time2.Add(time.Minute*30)) > 0 { if storeDetail.OpenTime2 != 0 && storeDetail.CloseTime2 != 0 { 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.Hour)) > 0 { + if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(time.Minute*30)) > 0 { s.CancelWaybill(bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonNotInStoreOpenTime) } } else { @@ -836,9 +836,9 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf var income int64 if order.OrderPayPercentage < 50 { - income = order.TotalShopMoney * int64((order.OrderPayPercentage / 2)) + income = order.TotalShopMoney * int64((order.OrderPayPercentage / 2)) / 100 } else if order.OrderPayPercentage > 50 && order.OrderPayPercentage < 100 { - income = order.TotalShopMoney - order.NewEarningPrice + income = order.TotalShopMoney - order.EarningPrice } else if order.OrderPayPercentage == 100 { income = order.TotalShopMoney - order.ShopPrice } @@ -865,7 +865,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") //} if storeDetail != nil { - globals.SugarLogger.Debugf("三方运单门店营业时间范围 :time1 %v ,time2 %v", storeDetail.OpenTime1, storeDetail.CloseTime1) + globals.SugarLogger.Debugf("三方运单门店营业时间范围 orderID: %s :time1 %v ,time2 %v", order.VendorOrderID, storeDetail.OpenTime1, storeDetail.CloseTime1) if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now()) time2 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now())