admin
2025-02-25 30d8e227e8d823b6c38c3b9c90ac2df03b63befe
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -85,6 +85,8 @@
import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -105,6 +107,8 @@
@Controller
@RequestMapping("api/v2/search")
public class SearchControllerV2 {
    Logger logger = LoggerFactory.getLogger(SearchControllerV2.class);
    @Resource
    private ConfigService configService;
@@ -759,8 +763,8 @@
        //是否包含淘宝链接/口令
        if (page == 1) {
            List<String> linkList = HttpUtil.getUrlListFromText(key);
            if ((linkList != null && linkList.size() > 0) || TaoBaoUtil.isHaveNewVersionTaoBaoToken(key)) {
            if (((linkList != null && linkList.size() > 0) || TaoBaoUtil.isHaveNewVersionTaoBaoToken(key))&&false) {
                // 暂时不通过链接搜索
                String id = DaTaoKeApiUtil.parseGoodsIdFromToken(key);
                if (id != null) {
                    goodsId = id;
@@ -779,12 +783,12 @@
                }
                if (goodsId == null) {
                    //解析链接
                    if (linkList != null && linkList.size() > 0) {
                        String tempGoodsId = clipboardAnalysisManager.parseTBAuctionIdFromLink(linkList.get(0));
                        if (!StringUtil.isNullOrEmpty(tempGoodsId)) {
                            goodsId = tempGoodsId;
                        }
                    }
//                    if (linkList != null && linkList.size() > 0) {
//                        String tempGoodsId = clipboardAnalysisManager.parseTBAuctionIdFromLink(linkList.get(0));
//                        if (!StringUtil.isNullOrEmpty(tempGoodsId)) {
//                            goodsId = tempGoodsId;
//                        }
//                    }
                }
            }
@@ -867,9 +871,39 @@
                }
                // 淘宝api搜索商品
                //TODO 测试注释
                TaoBaoSearchResult result = taoBaoGoodsCacheUtil.getSearchResult(sf); // TaoBaoUtil.search(sf, specialId, null);
                if (result == null) {
                    result = TaoBaoUtil.search(sf, specialId, null);
                    if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 1) {
                        for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
                            if (StringUtil.isNullOrEmpty(g.getAuctionId())) {
                                logger.error("搜索结果有空ID的情况  关键字{}", key);
                            }
                        }
                    }
                    //如果是单个商品,且里面的商品ID为空,就需要借助大淘客搜索
                    if (result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() == 1 && StringUtil.isNullOrEmpty(result.getTaoBaoGoodsBriefs().get(0).getAuctionId())) {
                        //有一个商品且里面的商品ID为空的情况
                        JSONArray darray = DaTaoKeApiUtil.tbSearch(key);
                        if (darray != null && darray.size() > 0) {
                            String auctionId = darray.optJSONObject(0).optString("item_id");
                            result.getTaoBaoGoodsBriefs().set(0, TaoKeApiUtil.searchGoodsDetail(auctionId));
                        }else{
                            // 大淘客无法搜索到,就将最后一个字去掉然后再搜索
                            String originText = sf.getKey();
                            sf.setKey(originText.substring(0,originText.length()-1));
                            result = TaoBaoUtil.search(sf, specialId, null);
//                            if(result.getTaoBaoGoodsBriefs() != null)
//                                for(TaoBaoGoodsBrief tb: result.getTaoBaoGoodsBriefs()){
//                                    if(originText.equalsIgnoreCase(tb.getTitle())){
//
//                                        break;
//                                    }
//                                }
                        }
                    }
                    taoBaoGoodsCacheUtil.saveSearchResult(sf, result);
                }
                TaoBaoSearchResult finalResult = result;
@@ -997,7 +1031,7 @@
        boolean hasCoupon = false;
        if (goodsId != null) {
            JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId));
            JDGoods goods = JDApiUtil.getGoodsDetail(goodsId);
            if (goods != null) {
                count = 1;
                goodsList.add(goods);
@@ -1206,7 +1240,7 @@
        if (goodsId != null) {
            try {
                PDDGoodsDetail pddGoodsDetail = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsId), PinDuoDuoApiUtil.PID_DEFAULT, customParams);
                PDDGoodsDetail pddGoodsDetail = PinDuoDuoApiUtil.getGoodsDetail(goodsId, PinDuoDuoApiUtil.PID_DEFAULT, customParams);
                if (pddGoodsDetail != null) {
                    count = 1;
                    goodsList.add(pddGoodsDetail);
@@ -1215,7 +1249,7 @@
                e.printStackTrace();
                if (e.getCode() == PDDApiException.CODE_NOT_AUTH) {
                    try {
                        PDDGoodsDetail pddGoodsDetail = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsId), PinDuoDuoApiUtil.PID_DEFAULT, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
                        PDDGoodsDetail pddGoodsDetail = PinDuoDuoApiUtil.getGoodsDetail(goodsId, PinDuoDuoApiUtil.PID_DEFAULT, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
                        if (pddGoodsDetail != null) {
                            count = 1;
                            goodsList.add(pddGoodsDetail);