修改未加入营销商品库的商品返利为0

admin

2019-04-01 5674a2bb28b92a843b9bb43cff02c3e7967c1b84

修改未加入营销商品库的商品返利为0

 fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java

@@ -3,12 +3,14 @@
import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Set;



import javax.annotation.Resource;

import javax.print.attribute.standard.NumberUp;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Controller;

@@ -34,6 +36,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

@@ -47,6 +50,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.SearchFilterUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



import net.sf.ehcache.Element;

import net.sf.json.JSONArray;

@@ -82,7 +86,8 @@


    @RequestMapping(value = "gethotsearch", method = RequestMethod.POST)

    public void getHotSearch(AcceptData acceptData, PrintWriter out) {

        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

                acceptData.getPackages());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult("系统不存在"));

            return;

@@ -160,7 +165,8 @@
            String endprice, String fastFilter, PrintWriter out) {

        String bid = getHistorySearchBid(acceptData);

        historySearchService.addHistorySearch(kw, bid);

        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

                acceptData.getPackages());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult("系统不存在"));

            return;

@@ -398,7 +404,8 @@


        historySearchService.addHistorySearch(kw, bid);



        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

                acceptData.getPackages());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult("系统不存在"));

            return;

@@ -593,6 +600,25 @@
        if (result == null) {

            return null;

        }

        // 搜索是否在营销主商品库

        if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {

            String numIds = "";

            for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

                numIds += goods.getAuctionId() + ",";

            }

            if (numIds.endsWith(","))

                numIds = numIds.substring(0, numIds.length() - 1);

            try {

                List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getBatchGoodsInfos(numIds);

                Map<Long, Integer> map = new HashMap<>();

                for (TaoBaoGoodsBrief g : goodsList)

                    map.put(g.getAuctionId(), g.getMaterialLibType());

                for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())

                    goods.setMaterialLibType(map.get(goods.getAuctionId()));

            } catch (TaobaoGoodsDownException e) {

                e.printStackTrace();

            }

        }



        List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();

        if (result.getNavList() != null)


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -1310,6 +1310,9 @@
     * @return

     */

    public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {

        if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)

            return "¥0.00";

        else

        return "¥" + getGoodsHongBaoMoney(goodsBrief, rate).toString();

    }




 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -337,7 +337,9 @@
                    goods.setFreeShipment(1);



                if ("1".equalsIgnoreCase(item.optString("material_lib_type")))

                    ;

                    goods.setMaterialLibType(1);

                else

                    goods.setMaterialLibType(0);



                goodsList.add(goods);

            }

@@ -385,6 +387,7 @@
                        g.setCouponStartFee(new BigDecimal(0));

                    }

                    g.setCreatetime(new Date());

                    g.setMaterialLibType(goods.getMaterialLibType());

                    return g;

                }

            }

@@ -452,6 +455,7 @@
                        g.setCouponStartFee(new BigDecimal(0));

                    }

                    g.setCreatetime(new Date());

                    g.setMaterialLibType(goods.getMaterialLibType());

                    return g;

                }

            }