admin
2020-10-15 1c23d47c352ef57bbd4a59e00d4d5b4585853f1e
拼多多搜索bug
11个文件已修改
1个文件已添加
57 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/goods/FreeGoodsCouponJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/Constant.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/src/test/java/com/yeshi/utils/Test.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -153,7 +153,7 @@
                        sf.setPage(1);
                        sf.setPageSize(100);
                        sf.setGoodsIdList(listIdPDD.toArray(ids));
                        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf);
                        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf,"437032");
                        if (result != null) {
                            listPDD = result.getGoodsList();
                        }
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -1489,7 +1489,7 @@
                    Long[] strings = new Long[goodsIdList.size()];
                    pddfilter.setGoodsIdList(goodsIdList.toArray(strings));
                    PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
                    PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
                    if (result != null) {
                        List<PDDGoodsDetail> goodsList = result.getGoodsList();
                        if (goodsList != null && goodsList.size() > 0) {
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -564,7 +564,7 @@
        /*-------- 拼多多商品  -------*/
        if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {
            searchPDDGoods(acceptData, searchkey, page, filter, order, ap, out);
            searchPDDGoods(acceptData,uid, searchkey, page, filter, order, ap, out);
            return;
        }
@@ -934,7 +934,7 @@
     * @param ap
     * @param out
     */
    private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,
    private void searchPDDGoods(AcceptData acceptData,Long uid, String key, Integer page, String filter, Integer order,
                                AppPageNotification ap, PrintWriter out) {
        PDDSearchFilter pddfilter = new PDDSearchFilter();
        pddfilter.setKw(SearchFilterUtil.filterSearchContent(key));
@@ -979,7 +979,7 @@
        JSONObject data = new JSONObject();
        JSONArray array = new JSONArray();
        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,uid+"");
        if (result != null) {
            count = result.getTotalCount();
            Gson gson = JsonUtil.getApiCommonGson();
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java
@@ -678,7 +678,7 @@
                    Long[] strings = new Long[goodsIdList.size()];
                    pddfilter.setGoodsIdList(goodsIdList.toArray(strings));
                    PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
                    PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
                    if (result != null) {
                        List<PDDGoodsDetail> goodsList = result.getGoodsList();
                        if (goodsList != null && goodsList.size() > 0) {
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java
@@ -555,7 +555,7 @@
        JSONObject data = new JSONObject();
        JSONArray array = new JSONArray();
        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,"437032");
        if (result != null) {
            count = result.getTotalCount();
            Gson gson = JsonUtil.getApiCommonGson();
fanli/src/main/java/com/yeshi/fanli/job/goods/FreeGoodsCouponJob.java
@@ -344,7 +344,7 @@
            pddfilter.setRangeList(rangeList);
            for (int page = 1; page < 1000; page++) {
                pddfilter.setPage(page);
                PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
                PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
                if (result == null) {
                    break;
                }
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.util.Constant;
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.brand.BrandGoodsCaheDao;
@@ -273,7 +274,7 @@
            pddfilter.setPage(1);
            pddfilter.setPageSize(100);
            pddfilter.setSortType(6);
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
            int count = 0;
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
@@ -5,6 +5,7 @@
import javax.annotation.Resource;
import com.yeshi.fanli.util.Constant;
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.brand.BrandShopCaheDao;
@@ -97,7 +98,7 @@
        pddfilter.setSortType(6);
        pddfilter.setMerchantType(3);
        
        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
        if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0) {
            boolean addShop = true;
            List<PDDGoodsDetail> goodsList = result.getGoodsList();
fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java
@@ -128,7 +128,7 @@
        if (cid == 1) {
            pddfilter.setPage(page);
            pddfilter.setPageSize(Constant.PAGE_SIZE);
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
            if (result == null) {
                return null;
            } else {
@@ -141,7 +141,7 @@
            pddfilter.setPage(page);
            pddfilter.setPageSize(Constant.PAGE_SIZE);
            pddfilter.setOptId(Long.parseLong(pddcid));
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
            if (result == null) {
                return null;
            } else {
@@ -159,7 +159,7 @@
            pddfilter.setPage(page);
            pddfilter.setPageSize(10);
            pddfilter.setOptId(Long.parseLong(arrayId[i]));
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
            PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
            if (result != null) {
                List<PDDGoodsDetail> listGoods = result.getGoodsList();
                if (listGoods != null && listGoods.size() > 0) {
fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -213,6 +213,8 @@
    public static ConstantConfig constantConfig;
    public static String PDD_SEARCH_CUSTOMER_PARAMS="437032";
    /**
     * 淘宝商品红包
     */
fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
@@ -79,10 +79,11 @@
     * @param sf
     * @return
     */
    public static PDDGoodsResult searchGoods(PDDSearchFilter sf) {
    public static PDDGoodsResult searchGoods(PDDSearchFilter sf, String customerParamters) {
        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
        Map<String, String> map = new HashMap<>();
        map.put("type", "pdd.ddk.goods.search");
        map.put("custom_parameters", customerParamters);
        if (sf.getOptId() != null)
            map.put("opt_id", sf.getOptId() + "");
        if (sf.getPage() != null)
@@ -110,6 +111,7 @@
        map.put("pid", PID_FANLI);
        String result = baseRequest(map);
        System.out.println(result);
        JSONObject json = JSONObject.fromObject(result);
        JSONObject root = json.optJSONObject("goods_search_response");
        if (root == null) {
@@ -134,7 +136,7 @@
        Long[] ids = new Long[goodsIds.size()];
        goodsIds.toArray(ids);
        filter.setGoodsIdList(ids);
        PDDGoodsResult result = searchGoods(filter);
        PDDGoodsResult result = searchGoods(filter,Constant.PDD_SEARCH_CUSTOMER_PARAMS);
        if (result != null)
            return result.getGoodsList();
        return null;
@@ -349,7 +351,7 @@
     * @return
     */
    public static String getPromotionUrl(Long goodsId, String pid, String customParams) {
        PDDPromotionUrl promotion = convert(goodsId, pid, customParams,false);
        PDDPromotionUrl promotion = convert(goodsId, pid, customParams, false);
        if (promotion != null) {
            return promotion.getShortUrl();
        }
utils/src/test/java/com/yeshi/utils/Test.java
New file
@@ -0,0 +1,19 @@
package com.yeshi.utils;
import org.yeshi.utils.LinuxRemoteCommandUtil;
public class Test {
    public static void main(String[] args) {
        String solrIP = "203.195.196.115";
        String serverAccount = "root";
        String serverPwd = "Yeshi2016@";
        try {
            LinuxRemoteCommandUtil.execute(solrIP, serverAccount, serverPwd, "/solr/solr-7.5.0/solr_restart.sh");
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}