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-10-21 11:45:08 +08:00
parent 7843e96486
commit 754e0dd929
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

15
business/partner/printer/jxprint/jxprint.go
View File

@@ -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 {

1
business/partner/printer/yilianyun/yilianyun.go
View File

@@ -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)

2
globals/refutil/refutil.go
View File

@@ -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
}