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-03-31 15:36:30 +08:00
parent bf614b16a0
commit e733b1f096
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,7 +967,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
if v.Status < model.WaybillStatusEndBegin &&
!model.IsWaybillPlatformOwn(v) &&
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
globals.SugarLogger.Debugf("调用蜂鸟清楚数据=====================, orderID:%s, bill:%v", savedOrderInfo.order.VendorOrderID, bill2Keep)
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
if err2 == nil {
// 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败）
@@ -980,6 +980,8 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
partner.CurOrderManager.OnOrderMsg(savedOrderInfo.order, "取消三方运单失败", err2.Error())
}
}
globals.SugarLogger.Debugf("未调用蜂鸟清楚数据==============, orderID:%s, bill:%v", savedOrderInfo.order.VendorOrderID, bill2Keep)
}
return err
}

44
business/jxstore/cms/store_sku.go
View File

@@ -737,28 +737,28 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []strin
func GetStoresSkus(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []string, isFocus, isHighPrice bool, priceType int, keyword string, isBySku, isAct bool, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo, err error) {
// 管理员进入
if /*permission.IsRoled(ctx)*/ true {
// 获取管理员绑定门店
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
var storeIDs2 []int
if len(storeIDs) > 0 {
for _, v := range storeIDs {
if storeIDsMap[v] != 0 {
storeIDs2 = append(storeIDs2, v)
}
}
if len(storeIDs2) == 0 {
storeIDs2 = append(storeIDs2, -1)
}
} else {
for k, _ := range storeIDsMap {
storeIDs2 = append(storeIDs2, k)
}
}
storeIDs = nil
storeIDs = storeIDs2
}
}
//if /*permission.IsRoled(ctx)*/ true {
// // 获取管理员绑定门店
// if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
// var storeIDs2 []int
// if len(storeIDs) > 0 {
// for _, v := range storeIDs {
// if storeIDsMap[v] != 0 {
// storeIDs2 = append(storeIDs2, v)
// }
// }
// if len(storeIDs2) == 0 {
// storeIDs2 = append(storeIDs2, -1)
// }
// } else {
// for k, _ := range storeIDsMap {
// storeIDs2 = append(storeIDs2, k)
// }
// }
// storeIDs = nil
// storeIDs = storeIDs2
// }
//}
return GetStoresSkusNew(ctx, storeIDs, skuIDs, upcs, isFocus, isHighPrice, priceType, keyword, isBySku, isAct, params, offset, pageSize)
}