1
This commit is contained in:
@@ -269,10 +269,10 @@ func init() {
|
||||
}
|
||||
}
|
||||
if isAcceptIt {
|
||||
if err == nil {
|
||||
/*if err == nil {
|
||||
sch.notifyNewOrder(order, false)
|
||||
msghub.OnNewOrder(order)
|
||||
}
|
||||
}*/
|
||||
} else {
|
||||
partner.CurOrderManager.OnOrderMsg(order, "黑名单拒单", "")
|
||||
}
|
||||
|
||||
@@ -6111,7 +6111,6 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
|
||||
homePages = append(homePages, homePage)
|
||||
}
|
||||
// todo 明天测试西南交大店首页没商品
|
||||
globals.SugarLogger.Debugf("----------homePages := %s", utils.Format4Output(homePages, false))
|
||||
return homePages, "", nil
|
||||
}
|
||||
|
||||
|
||||
@@ -359,13 +359,6 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
|
||||
} else {
|
||||
content = c.getOrderContent(order, store.Tel1, storeDetail)
|
||||
}
|
||||
if store.PrinterSN == "525553742" {
|
||||
globals.SugarLogger.Debugf("-------------storeDetail := %s", utils.Format4Output(storeDetail, false))
|
||||
globals.SugarLogger.Debugf("-------------order := %s", utils.Format4Output(order, false))
|
||||
globals.SugarLogger.Debugf("-------------printType := %s", utils.Format4Output(printType, false))
|
||||
globals.SugarLogger.Debugf("-------------asfOrder := %s", utils.Format4Output(asfOrder, false))
|
||||
globals.SugarLogger.Debugf("-------------content := %s", content)
|
||||
}
|
||||
return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content)
|
||||
}
|
||||
|
||||
|
||||
@@ -567,7 +567,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
|
||||
}) {
|
||||
err = nil
|
||||
goodsOrder, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
|
||||
if goodsOrder.Status <= model.OrderStatusAccepted {
|
||||
if goodsOrder.Status < model.OrderStatusAccepted {
|
||||
order.Status = model.OrderStatusAccepted
|
||||
dao.UpdateEntity(dao.GetDB(), order, "Status")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user