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:
邹宗楠
2023-07-20 09:02:19 +08:00
parent 76d1ce7aea
commit 591f80875f
3 changed files with 158 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1173,8 +1173,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
sql += " , t4.unit_price DESC LIMIT 99"
}
var tmpList []*tGetStoresSkusInfo
globals.SugarLogger.Debugf("GetStoresSkusNew sql=%s,sqlParams=%s", sql, sqlParams)
if err = dao.GetRowsTx(txDB, &tmpList, sql, sqlParams...); err != nil {
dao.Rollback(db, txDB)
return nil, err
@@ -1184,7 +1182,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str
}
dao.Commit(db, txDB)
storeNameMap := make(map[int64]*dao.StoreSkuNameExt)
globals.SugarLogger.Debugf("GetStoresSkusNew tmpList=%s", utils.Format4Output(tmpList, false))
for _, v := range tmpList {
var storeName *dao.StoreSkuNameExt
index := jxutils.Combine2Int(v.StoreID, v.ID)

312
business/jxstore/misc/misc.go
View File

@@ -284,18 +284,20 @@ func Init() {
ScheduleTimerFunc("RefreshSyncSkuList_tao", func() {
syncStoreSkuTao()
}, []string{
//"13:00:00",
//"15:00:00",
//"17:00:00",
"13:00:00",
"15:00:00",
"17:00:00",
"18:35:00",
//"20:40:00",
//"21:40:00",
//"23:40:00",
//"01:40:00",
"20:40:00",
"22:40:00",
"23:40:00",
"01:40:00",
"03:40:00",
//"05:40:00",
//"07:40:00",
"05:40:00",
"07:40:00",
"08:40:00",
"10:40:00",
"12:40:00",
})
}
@@ -662,152 +664,152 @@ var beijin = []int{
667354,
667321,
667319,
667316,
667269,
667268,
667267,
667260,
667132,
667094,
667030,
666965,
666714,
666708,
666705,
103437,
103349,
103123,
103121,
103106,
103038,
103028,
103019,
102831,
102751,
102683,
102542,
102514,
102382,
102182,
102178,
102173,
102098,
102094,
102080,
102072,
102069,
101870,
101869,
101868,
101867,
101866,
101865,
100956,
100930,
100871,
100786,
100746,
100744,
100726,
100705,
100400,
100111,
100108,
100106,
100104,
100103,
100102,
100100,
100097,
100096,
100095,
100093,
100092,
100089,
100087,
100086,
100085,
100082,
100079,
100078,
669053, // 上海
668985,
668960,
668959,
668953,
668949,
668932,
668931,
668917,
668909,
668908,
668906,
668905,
668901,
668894,
668886,
668884,
668880,
668878,
668757,
668751,
668701,
668622,
668618,
668592,
668583,
668569,
668567,
668506,
668498,
668476,
668462,
668276,
668180,
667320,
667237,
667231,
667068,
667036,
666678,
103191,
103074,
103065,
103051,
103050,
103037,
103029,
103018,
103002,
102999,
102969,
102966,
102951,
102946,
102939,
102938,
102934,
102933,
102930,
102924,
102920,
102908,
102903,
102561,
102293,
100946,
100945,
100943,
100935,
100905,
100720,
100325,
100324,
100309,
100299,
100296,
100292,
100290,
//667316,
//667269,
//667268,
//667267,
//667260,
//667132,
//667094,
//667030,
//666965,
//666714,
//666708,
//666705,
//103437,
//103349,
//103123,
//103121,
//103106,
//103038,
//103028,
//103019,
//102831,
//102751,
//102683,
//102542,
//102514,
//102382,
//102182,
//102178,
//102173,
//102098,
//102094,
//102080,
//102072,
//102069,
//101870,
//101869,
//101868,
//101867,
//101866,
//101865,
//100956,
//100930,
//100871,
//100786,
//100746,
//100744,
//100726,
//100705,
//100400,
//100111,
//100108,
//100106,
//100104,
//100103,
//100102,
//100100,
//100097,
//100096,
//100095,
//100093,
//100092,
//100089,
//100087,
//100086,
//100085,
//100082,
//100079,
//100078,
//669053, // 上海
//668985,
//668960,
//668959,
//668953,
//668949,
//668932,
//668931,
//668917,
//668909,
//668908,
//668906,
//668905,
//668901,
//668894,
//668886,
//668884,
//668880,
//668878,
//668757,
//668751,
//668701,
//668622,
//668618,
//668592,
//668583,
//668569,
//668567,
//668506,
//668498,
//668476,
//668462,
//668276,
//668180,
//667320,
//667237,
//667231,
//667068,
//667036,
//666678,
//103191,
//103074,
//103065,
//103051,
//103050,
//103037,
//103029,
//103018,
//103002,
//102999,
//102969,
//102966,
//102951,
//102946,
//102939,
//102938,
//102934,
//102933,
//102930,
//102924,
//102920,
//102908,
//102903,
//102561,
//102293,
//100946,
//100945,
//100943,
//100935,
//100905,
//100720,
//100325,
//100324,
//100309,
//100299,
//100296,
//100292,
//100290,
}
// syncStoreSkuTao 同步商品到淘鲜达

2
business/partner/delivery/rider.go
View File

@@ -103,7 +103,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil)
if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin {
globals.SugarLogger.Debugf("订单物流状态结束,不在推送订单状态:orderID[%s],wayBillId[%s]", v.VendorOrderID, waybillList[0].VendorWaybillID)
globals.SugarLogger.Debug("订单物流状态结束,不在推送订单状态:orderID[%s],wayBillId[%s]", v.VendorOrderID, waybillList[0].VendorWaybillID)
continue
}
}