Merge pull request '优化索引' (#95) from test into master

Reviewed-on: https://git.oa00.com/recook/backend_v2/pulls/95

internal/v2/logic/third/supply.go

@@ -185,8 +185,8 @@ func (s *supplyLogic) Adopt(data AdoptSkuInfo) error {
 	if err != nil {
 		return err
 	}
-	var recookGoodsSkuModels []goods.RecookGoodsSkuModel
+	var recookGoodsSkuModels []manage.RecookThirdPartySupply
-	mysql.Db.Where("third_party_type = ? and third_party_sku_id in ?", goods.RecookGoodsInfoThirdPartyTypeSupply, groups[0].GroupSkuIds).Find(&recookGoodsSkuModels)
+	mysql.Db.Where("supply_sku_id in ? and goods_id > 0", groups[0].GroupSkuIds).Find(&recookGoodsSkuModels)
 
 	if len(recookGoodsSkuModels) > 0 {
 		// 已添加过商品
@@ -528,7 +528,7 @@ func (s *supplyLogic) SyncPrice(skuIds []uint) error {
 				if mSkuPrice[partySupply.SupplySkuId].Status == manage.RecookThirdPartySupplySupplyStatusUp {
 					inventory = 500
 				}
-				if tx.Model(&goods.RecookGoodsSkuModel{}).Where("third_party_type = ? and third_party_sku_id = ?", goods.RecookGoodsInfoThirdPartyTypeSupply, partySupply.SupplySkuId).Updates(map[string]interface{}{
+				if tx.Model(&goods.RecookGoodsSkuModel{}).Where("goods_id = ? and third_party_type = ? and third_party_sku_id = ?", partySupply.GoodsId, goods.RecookGoodsInfoThirdPartyTypeSupply, partySupply.SupplySkuId).Updates(map[string]interface{}{
 					"purchase_price": partySupply.Price,
 					"inventory":      inventory,
 				}).Error != nil {
@@ -670,7 +670,7 @@ func (s *supplyLogic) SyncData(skuIds []uint) error {
 					if err == nil {
 						// 获取sku信息
 						recookGoodsSkuModel := goods.RecookGoodsSkuModel{}
-						mysql.Db.Where("third_party_type = ? and third_party_sku_id = ?", goods.RecookGoodsInfoThirdPartyTypeSupply, partySupply.SupplySkuId).First(&recookGoodsSkuModel)
+						mysql.Db.Where("goods_id = ? and third_party_type = ? and third_party_sku_id = ?", partySupply.GoodsId, goods.RecookGoodsInfoThirdPartyTypeSupply, partySupply.SupplySkuId).First(&recookGoodsSkuModel)
 						if recookGoodsSkuModel.Id > 0 {
 							// 发票税率
 							skuInvoiceModel := goods.RecookSkuInvoiceModel{}
@@ -711,7 +711,7 @@ func (s *supplyLogic) SyncData(skuIds []uint) error {
 					if skuInfo.Status == manage.RecookThirdPartySupplySupplyStatusUp {
 						inventory = 500
 					}
-					if tx.Model(&goods.RecookGoodsSkuModel{}).Where("third_party_type = ? and third_party_sku_id = ?", goods.RecookGoodsInfoThirdPartyTypeSupply, partySupply.SupplySkuId).Updates(map[string]interface{}{
+					if tx.Model(&goods.RecookGoodsSkuModel{}).Where("goods_id = ? and  third_party_type = ? and third_party_sku_id = ?", partySupply.GoodsId, goods.RecookGoodsInfoThirdPartyTypeSupply, partySupply.SupplySkuId).Updates(map[string]interface{}{
 						"purchase_price": partySupply.Price,
 						"inventory":      inventory,
 						"pic_url":        skuInfo.ImgUrl,