diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index ae1f88e9e..7a0625401 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4420,13 +4420,14 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) { var ( db = dao.GetDB() ) - if time.Now().YearDay()%2 != 0 { + if time.Now().YearDay()%5 != 0 { return } //token是三天,两天刷新一次token codes, _ := dao.GetVendorOrgCode(db, model.VendorIDDD, "", "platform") for _, v := range codes { if v.Token != "" { + api.TiktokStore.SetRefreshToken(v.Token) if result, err := api.TiktokStore.RefreshToken(); err == nil { token, _ := json.Marshal(result) v.Token = string(token) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index bb30803d3..cb37bc429 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -33,7 +33,6 @@ func (c *PrinterHandler) GetVendorID() int { } func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, printSn, orderSeq, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) { - globals.SugarLogger.Debugf("PrintMsg id1:%s", printSn) if printSn != "" && globals.EnableStoreWrite { printSn = strings.Split(printSn, "_")[0] if _, err := api.JxPrintAPI.DoPrint(printSn, msgContent, utils.Str2Int(orderSeq)); err == nil { @@ -244,28 +243,22 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, if len(order.Skus) == 0 { return } - printData := ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) - //printData[BigFont] = "small" - //if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { - // printData[BigFont] = "big" - //} - //// 打印次数 - //printData[PrintNumber] = utils.Int2Str(model.YES) - //if store.PrinterFontSize == partner.PrinterFontSizeBig2 || store.PrinterFontSize == partner.PrinterFontSizeNormal2 { - // printData[PrintNumber] = utils.Int2Str(2) - //} + var printData map[string]string printData[AppID] = "1000" // 菜市应用 switch printType { case "order": // 订单状态 printData[OrderStatus] = utils.Int2Str(order.Status) + printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) case "wayBill": // 运单状态 printData[WayBillStatus] = order.VendorStatus + printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) case "store": // 门店状态 printData[StoreStatus] = utils.Int2Str(store.Status) case "enter": // 催单 printData[ReminderStatus] = "1" case "afs": // 售后 printData[OrderStatus] = utils.Int2Str(130) + printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) } orderPrint, err := json.Marshal(printData) if err != nil { diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 8515e3eb0..365b59f37 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -362,7 +362,6 @@ func (c *PrinterHandler) GetVendorID() int { } func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, machineCode, possibleToken, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) { - globals.SugarLogger.Debugf("PrintMsg machineCode:%s", machineCode) if machineCode != "" { if globals.EnableStoreWrite { err = getApiByToken(possibleToken).PrintMsgWithToken(machineCode, msgTitle, msgContent, possibleToken) diff --git a/globals/refutil/refutil.go b/globals/refutil/refutil.go index c12910e91..f5bc50f9b 100644 --- a/globals/refutil/refutil.go +++ b/globals/refutil/refutil.go @@ -67,8 +67,6 @@ func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, ob if m[k] != nil && excludedMap[k] == 0 /*&& v != nil*/ && (!isCheckValue || !IsValueEqual(m[k], v)) { valid[k] = v m[k] = v - globals.SugarLogger.Debugf("m[k]====%s", utils.Format4Output(m[k], false)) - globals.SugarLogger.Debugf("valid[k] ====%s", utils.Format4Output(valid[k], false)) } else { invalid[k] = v }