This commit is contained in:
邹宗楠
2025-04-21 18:01:24 +08:00
parent a586e62aa3
commit a900238a6b
2 changed files with 3 additions and 1 deletions

View File

@@ -271,6 +271,8 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
}
func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {
order2 := order
order2.Status = model.OrderStatusCanceled
return c.PrintOrder(ctx, store, storeDetail, order, "order", nil)
}

View File

@@ -602,7 +602,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSPT ||
logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi ||
logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe ||
logisticsCode == mtwmapi.PeiSongTypeMixedExpressQiKe || logisticsCode == mtwmapi.PeiSongTypeFranchise
logisticsCode == mtwmapi.PeiSongTypeMixedExpressQiKe || logisticsCode == mtwmapi.PeiSongTypeFranchise || logisticsCode == mtwmapi.PeiSongTypeSelf
//1001-专送加盟1002-专送(自建)
//2002-快送3001-混合送(专送+快送)
//4015-企客远距离配送