diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 0845c9f58..8621a8213 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -260,7 +260,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m dao.UpdateEntity(db, order, "OrderFinishedAt") } else if orderStatus.Status == model.OrderStatusCanceled { globals.SugarLogger.Debugf("==============orderStatus := %s", utils.Format4Output(orderStatus, false)) - order2, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 + order2, _ := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 if orderStatus.OrderType == model.OrderTypeOrder { waybill, _ := dao.GetWaybills(db, order2.VendorOrderID, []int64{model.VendorIDMTPS, model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}) for _, v := range waybill { @@ -275,18 +275,15 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m dao.UpdateEntity(db, order2, "OrderFinishedAt") } - //如果取消订单则要把库存加回去 - if err2 == nil { - // 判断是否需要打印取消订单 - storeDetail, err := c.LoadStoreDetail(order2.StoreID, order2.VendorID) - globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) - if err == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 - globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output("222222222222222", false)) - _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) - } - if err != nil { - globals.SugarLogger.Debug("Get store Detail Err: ", err) - } + // 判断是否需要打印取消订单 + storeDetail, errDetail := c.LoadStoreDetail(order2.StoreID, order2.VendorID) + globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) + if errDetail == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 + globals.SugarLogger.Debugf("==============storeDetail := %s , %d", utils.Format4Output(order2.VendorOrderID, false), order2.StoreID) + _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) + } + if err != nil { + globals.SugarLogger.Debug("Get store Detail Err: ", err) } }