fix: rebase

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

@@ -23,7 +23,6 @@ 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"
@@ -854,9 +853,7 @@ func (g goodsLogic) GoodsList(args *strict.ArgsRecookGoodsList,
 	query := dbc.DB.Table(rg.TableName())
 	{
 		if args.IsSale {
-			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)
+			query = query.Where("is_sale = 1")
 		}
 		if args.GoodsID != 0 {
 			query = query.Where("id = ?", args.GoodsID)
@@ -971,29 +968,28 @@ 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,
-				SalePurchasePrice: sku.SalePurchasePrice,
+				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,
 				Invoice: strict.Invoice{
 					GoodsName:     sku.InvoiceObj.GoodsName,
 					TaxSn:         sku.InvoiceObj.TaxSn,
@@ -1246,7 +1242,7 @@ func (g *goodsLogic) skuInfo(goodsID uint, user *manage2.RecookManageUserInfoMod
 // Publish 上下架.
 func (g *goodsLogic) Publish(args *strict.ArgsGoodsPublish) error {
 	var gs goods3.RecookGoodsInfoModel
-	mysql2.Db.Preload("SecondCategory").First(&gs, "id = ?", args.GoodsID)
+	mysql2.Db.First(&gs, "id = ?", args.GoodsID)
 	updateMap := make(map[string]interface{})
 	updateMap["hash"] = tools.GenerateGoodsHashSign()
 	updateMap["publish_status"] = goods3.RecookGoodsInfoPublishStatusFalse
@@ -1260,6 +1256,7 @@ func (g *goodsLogic) Publish(args *strict.ArgsGoodsPublish) error {
 		if err := tx.Table(gs.TableName()).Where("id = ?", args.GoodsID).Updates(updateMap).Error; err != nil {
 			return err
 		}
+
 		var temp goods2.GysGoodsInfoModel
 		tx.Table(temp.TableName()).First(&temp, "main_goods_id = ?", args.GoodsID)
 		if temp.Id > 0 {

internal/v2/logic/manage/jyy/sale.go

@@ -46,14 +46,17 @@ type ArgsPublish struct {
 }
 
 func (o logic) UpdateStatus(args ArgsPublish) error {
+	var gs goods.RecookGoodsInfoModel
+	mysql.Db.Preload("SecondCategory").First(&gs, "id = ?", args.GoodsID)
+	gs.Publish()
 	if err := mysql.Db.Table((&goods.RecookGoodsInfoModel{}).TableName()).Where("id = ?", args.GoodsID).Updates(map[string]interface{}{
 		"sale_publish": args.Status,
 	}).Error; err != nil {
 		return err
 	}
-	var gs goods.RecookGoodsInfoModel
-	mysql.Db.Preload("SecondCategory").First(&gs, "id = ?", args.GoodsID)
-	gs.Publish()
+	var gs1 goods.RecookGoodsInfoModel
+	mysql.Db.Preload("SecondCategory").First(&gs1, "id = ?", args.GoodsID)
+	gs1.Publish()
 	return nil
 }