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

取消时间限制

Browse Source
This commit is contained in:
邹宗楠
2022-03-16 08:58:35 +08:00
parent b58ee4a57d
commit 1209e6f26f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -761,9 +761,9 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde
} }
// 系统手动发单,不做营业时间校验 // 系统手动发单,不做营业时间校验
if storeDetail.SendOrderType == 1 { //if storeDetail.SendOrderType == 1 {
return nil // return nil
} //}
if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 {
time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now()) time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())

3
business/partner/purchase/mtwm/callback.go
View File

@@ -13,7 +13,6 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse
} else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade { } else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade {
response = CurPurchaseHandler.onNumberDowngrade(msg) response = CurPurchaseHandler.onNumberDowngrade(msg)
} else if msg.Cmd == mtwmapi.MsgTypeStoreBind { } else if msg.Cmd == mtwmapi.MsgTypeStoreBind {
} else { } else {
if orderID := GetOrderIDFromMsg(msg); orderID != "" { if orderID := GetOrderIDFromMsg(msg); orderID != "" {
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
@@ -34,9 +33,11 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse
} }
return response return response
} }
func GetOrderIDFromMsg(msg *mtwmapi.CallbackMsg) string { func GetOrderIDFromMsg(msg *mtwmapi.CallbackMsg) string {
return msg.FormData.Get(mtwmapi.KeyOrderID) return msg.FormData.Get(mtwmapi.KeyOrderID)
} }
func GetVendorStoreIDFromMsg(msg *mtwmapi.CallbackMsg) string { func GetVendorStoreIDFromMsg(msg *mtwmapi.CallbackMsg) string {
return msg.FormData.Get(mtwmapi.KeyAppPoiCode) return msg.FormData.Get(mtwmapi.KeyAppPoiCode)
} }