fix:管理后台批发商品搜索

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

@@ -853,10 +853,13 @@ func (g goodsLogic) GoodsList(args *strict.ArgsRecookGoodsList,
 	var rg goods3.RecookGoodsInfoModel
 	query := dbc.DB.Table(rg.TableName())
 	{
-		if args.IsSale {
+		if args.IsActivity {
 			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("id not in (?)", ids)
+		}
+		if args.IsSale {
+			query = query.Where("is_sale = 1")
 		}
 		if args.GoodsID != 0 {
 			query = query.Where("id = ?", args.GoodsID)
@@ -919,16 +922,6 @@ func (g goodsLogic) GoodsList(args *strict.ArgsRecookGoodsList,
 		case 2: // 接口获取
 			query = query.Where("third_party_type > ?", goods3.RecookGoodsInfoThirdPartyTypeNone)
 		}
-
-		if args.SourceStatus > 0 {
-			switch args.SourceStatus {
-			case 1: // 上架
-				query = query.Where("bomao_status = ?", goods3.RecookGoodsInfoBomaoStatusOn)
-			case 2: // 下架
-				query = query.Where("bomao_status = ?", goods3.RecookGoodsInfoBomaoStatusOff)
-			}
-			query = query.Where("bomao_status > ?", goods3.RecookGoodsInfoThirdPartyTypeNone)
-		}
 	}
 	query.Count(&total)
 	var base []strict.RecookGoodsBase
@@ -2146,7 +2139,7 @@ func (g *goodsLogic) InvoiceTitleCreate(p goods3.InvoiceTitleModel) error {
 			"bank":    resq.Bank,
 			"default": resq.Default,
 		})
-	} else {             //不存在则新增
+	} else { //不存在则新增
 		if p.Type == 1 { //1为公司，公司名称和公司税号为必填项
 			if p.Taxnum == "" || p.Name == "" {
 				return errors.New("公司名称和公司税号为必填项")

internal/v2/model/http/goods/goods.go

@@ -339,6 +339,7 @@ type ArgsRecookGoodsList struct {
 	SourceStatus uint   `json:"source_status"`
 	Status       uint   `json:"status"`
 	IsSale       bool   `json:"is_sale"`
+	IsActivity   bool   `json:"is_activity"`
 	bean.Page
 }