fix:批发管理塞选

internal/v2/logic/manage/goods/goods.go

@@ -23,6 +23,7 @@ import (
 	"recook/internal/v2/model/gys/enterprise"
 	goods2 "recook/internal/v2/model/gys/goods"
 	strict "recook/internal/v2/model/http/goods"
+	"recook/internal/v2/model/jyy"
 	"recook/internal/v2/model/recook/freight"
 	goods3 "recook/internal/v2/model/recook/goods"
 	manage2 "recook/internal/v2/model/recook/manage"
@@ -853,7 +854,9 @@ func (g goodsLogic) GoodsList(args *strict.ArgsRecookGoodsList,
 	query := dbc.DB.Table(rg.TableName())
 	{
 		if args.IsSale {
-			query = query.Where("is_sale = 1")
+			ids := make([]uint, 0)
+			mysql2.Db.Table((&jyy.ActivityGoods{}).TableName()).Pluck("goods_id", &ids)
+			query = query.Where("is_sale = 1 and id not in (?)", ids)
 		}
 		if args.GoodsID != 0 {
 			query = query.Where("id = ?", args.GoodsID)
@@ -968,28 +971,29 @@ func (g goodsLogic) GoodsList(args *strict.ArgsRecookGoodsList,
 				state = 2
 			}
 			temp := strict.Sku{
-				SkuID:          sku.Id,
-				Name:           sku.Name,
-				OriginalPrice:  sku.OriginalPrice,
-				PurchasePrice:  sku.PurchasePrice,
-				DiscountPrice:  sku.DiscountPrice,
-				CommissionRate: &commissionRate,
-				Commission:     &v.SkuObj[j].Commission,
-				Coupon:         &v.SkuObj[j].Coupon,
-				ControlPrice:   &v.SkuObj[j].ControlPrice,
-				TMallPrice:     sku.TMallPrice,
-				JdPrice:        sku.JdPrice,
-				Code:           sku.Code,
-				GoodsNum:       sku.GoodsNum,
-				Inventory:      sku.Inventory,
-				TMallUrl:       sku.TMallUrl,
-				JdUrl:          sku.JdUrl,
-				Coefficient:    vendor[v.VendorID].SourceNum,
-				PicUrl:         sku.PicURL,
-				SaleVolInc:     sku.SalesVolume,
-				LockInventory:  lock[0],
-				ServiceState:   state,
-				Exclude:        exclude,
+				SkuID:             sku.Id,
+				Name:              sku.Name,
+				OriginalPrice:     sku.OriginalPrice,
+				PurchasePrice:     sku.PurchasePrice,
+				DiscountPrice:     sku.DiscountPrice,
+				CommissionRate:    &commissionRate,
+				Commission:        &v.SkuObj[j].Commission,
+				Coupon:            &v.SkuObj[j].Coupon,
+				ControlPrice:      &v.SkuObj[j].ControlPrice,
+				TMallPrice:        sku.TMallPrice,
+				JdPrice:           sku.JdPrice,
+				Code:              sku.Code,
+				GoodsNum:          sku.GoodsNum,
+				Inventory:         sku.Inventory,
+				TMallUrl:          sku.TMallUrl,
+				JdUrl:             sku.JdUrl,
+				Coefficient:       vendor[v.VendorID].SourceNum,
+				PicUrl:            sku.PicURL,
+				SaleVolInc:        sku.SalesVolume,
+				LockInventory:     lock[0],
+				ServiceState:      state,
+				Exclude:           exclude,
+				SalePurchasePrice: sku.SalePurchasePrice,
 				Invoice: strict.Invoice{
 					GoodsName:     sku.InvoiceObj.GoodsName,
 					TaxSn:         sku.InvoiceObj.TaxSn,