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:
邹宗楠
2024-01-19 10:06:20 +08:00
parent d4fccba75e
commit c66844b101
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
business/jxcallback/orderman/order.go
View File

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