diff --git a/internal/v2/logic/third/supply.go b/internal/v2/logic/third/supply.go index fc16fa6..def7233 100644 --- a/internal/v2/logic/third/supply.go +++ b/internal/v2/logic/third/supply.go @@ -788,12 +788,16 @@ func (s *supplyLogic) OrderSplit(orderSplit supply.OrderSplit) error { log.Println("重复拆单请求") return nil } - var parentOrderInfo manage2.RecookOrderInfoModel - if err := mysql.Db.Preload("OrderSku").First(&parentOrderInfo, "third_party_order_sn = ? and third_party_type = ?", orderSplit.ParentOrderSn, goods.RecookGoodsInfoThirdPartyTypeSupply).Error; err != nil { - return err - } var rod manage2.RecookOrderInfoModel if err := mysql.Db.Preload("OrderSku").First(&rod, "third_party_order_sn = ? and third_party_type = ?", orderSplit.RootOrderSn, goods.RecookGoodsInfoThirdPartyTypeSupply).Error; err != nil { + if err == gorm.ErrRecordNotFound { + log.Println("其他渠道下单") + return nil + } + return err + } + var parentOrderInfo manage2.RecookOrderInfoModel + if err := mysql.Db.Preload("OrderSku").First(&parentOrderInfo, "third_party_order_sn = ? and third_party_type = ?", orderSplit.ParentOrderSn, goods.RecookGoodsInfoThirdPartyTypeSupply).Error; err != nil { return err } return mysql.Db.Transaction(func(tx *gorm.DB) error {