Merge branch 'div_8'

yujian

2019-05-14 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5

Merge branch 'div_8'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
	fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java
	fanli/src/main/java/com/yeshi/fanli/mapping/taobao/dataoke/DaTaoKeDetailMapper.xml
	fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
	fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java

@@ -6,7 +6,6 @@


import javax.annotation.Resource;



import org.springframework.cache.ehcache.EhCacheCacheManager;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

@@ -27,13 +26,10 @@


    @Resource

    private ConfigService configService;



	
    @Resource

    private AppVersionService appVersionService;



    @Resource

    private EhCacheCacheManager ehCacheCacheManager;



    private  AppVersionService appVersionService;

	
    /**

     * 查询列表 - 新后台

     * 

@@ -120,23 +116,22 @@
            e.printStackTrace();

        }

    }



	
    /**

     * 查询列表 - 新后台

     * 
     * @param callback

     * @param key

     *            查询词 名称

     * @param key 查询词  名称

     * @param pageIndex

     * @param out

     */

    @RequestMapping(value = "getVersionList")

    public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out) {



    public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out){

		
        try {

            AppVersionInfo appVersionInfo = new AppVersionInfo();

            appVersionInfo.setVersion("全推");



			
			
            // IOS版本

            List<AppVersionInfo> list1 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_IOS);

            if (list1 == null) {

@@ -145,39 +140,27 @@
            List<AppVersionInfo> listIOS = new ArrayList<AppVersionInfo>();

            listIOS.add(appVersionInfo);

            listIOS.addAll(list1);



			
			
            // 安卓版本

            List<AppVersionInfo> list2 = appVersionService

                    .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);

            List<AppVersionInfo> list2 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);

            if (list2 == null) {

                list2 = new ArrayList<AppVersionInfo>();

            }

            List<AppVersionInfo> listAndroid = new ArrayList<AppVersionInfo>();

            listAndroid.add(appVersionInfo);

            listAndroid.addAll(list2);



			
            JSONObject data = new JSONObject();

            data.put("android", listAndroid);

            data.put("ios", listIOS);



			
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



			
        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("版本查询失败"));

            e.printStackTrace();

        }

    }



    /***

     * 清除缓存

     * 
     * @param callback

     * @param out

     */

    @RequestMapping(value = "clearCaches")

    public void clearCaches(String callback, PrintWriter out) {

        ehCacheCacheManager.getCacheManager().clearAll();

        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));

    }



}


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

@@ -2,7 +2,6 @@


import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

@@ -19,11 +18,9 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;

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

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

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.Utils;

@@ -46,9 +43,6 @@


    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;



    @Resource

    private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



    /**

     * 获取商品信息

@@ -174,18 +168,6 @@
                        return;

                    }

                }



            // 查询大淘客标题

            List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);

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

                root.put("type", 2);

                JSONObject data = new JSONObject();

                data.put("title", list.get(0).getdTitle());

                root.put("data", data);

                out.print(JsonUtil.loadTrueResult(root));

                return;

            }



            out.print(JsonUtil.loadFalseResult("暂不支持该类型！"));

            return;

        }


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

@@ -620,8 +620,6 @@
            filter.setPage(page);

            filter.setPageSize(pageSize);

            filter.setCateIds(taoBaoCatIds);

            //测试时添加

            filter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);//销量从高到低



            JSONObject result = taoKeGoodsService.searchWuLiao(filter);

            out.print(JsonUtil.loadTrueResult(result));


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

@@ -1728,6 +1728,7 @@
            redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);

        }

        Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();

		
        JSONObject root = new JSONObject();

        root.put("time", nextTime.getTimeInMillis());

        root.put("endTime", endTime > 0? endTime : 0);

@@ -1744,7 +1745,13 @@
     */

    @RequestMapping(value = "getSpikeGoods")

    public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {

        JSONObject params = new JSONObject();

        params.put("url", configService.get("spike_goods_link"));

        JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");

		
        JSONObject root = getSpikeGoodsContent(acceptData);

        root.put("params", params);

        root.put("jumpDetail", jumpDetail);

        out.print(JsonUtil.loadTrueResult(root));

    }



@@ -1924,9 +1931,11 @@
        goodsJson.put("price", tb.getReservePrice().toString());

        goodsJson.put("zkPrice", tb.getZkPrice().toString());



		
        // 30天销量

        goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));



        goodsJson.put("salesCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));

		
        // 分享赚

        BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);

        data.put("shareMoney", "¥" + shareMoney);


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

@@ -10,6 +10,7 @@
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;

@@ -23,6 +24,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.bus.recommend.Honest;

import com.yeshi.fanli.entity.bus.search.HistorySearch;

import com.yeshi.fanli.entity.bus.search.HotSearch;

import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;

import com.yeshi.fanli.entity.system.BusinessSystem;

@@ -34,7 +36,6 @@
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.entity.taobao.dataoke.DaTaoKeDetail;

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

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

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

@@ -43,14 +44,12 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.user.HistorySearchService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.EhcacheUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

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

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

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

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

@@ -89,9 +88,6 @@


    @Resource

    private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



    @Resource

    private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



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

    public void getHotSearch(AcceptData acceptData, PrintWriter out) {

@@ -607,21 +603,6 @@
        }



        TaoBaoSearchResult result = TaoBaoUtil.search(sf);

        // 大淘客过滤

        List<DaTaoKeDetail> detaokeList = daTaoKeGoodsDetailService.listByDtitle(kw);

        if (detaokeList != null)

            for (DaTaoKeDetail detail : detaokeList) {

                for (int i = 0; i < result.getTaoBaoGoodsBriefs().size(); i++) {

                    if (detail.getGoodsId().longValue() == result.getTaoBaoGoodsBriefs().get(i).getAuctionId()) {

                        result.getTaoBaoGoodsBriefs().set(i,

                                DaTaoKeUtil.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs().get(i), detail));

                        break;

                    }					
                }

            }



        // result.setTaoBaoGoodsBriefs(daTaoKeGoodsDetailService.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs()));



        if (result == null) {

            return null;

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java

@@ -118,6 +118,7 @@
        return daTaoKeDetailMapper.listByIds(idList);

    }


	
    @Override

    public List<DaTaoKeDetail> listByDtitle(String dtitle) {

        return daTaoKeDetailMapper.listByDtitle(dtitle.trim());

@@ -140,5 +141,4 @@
    public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {

        return daTaoKeDetailMapper.getGoodsNotInList(cid, listId,count);

    }


}


 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java

@@ -79,7 +79,8 @@
     */

    public Long countSearchByTitleWithCid(String title, Long cid);



    /*
	
    /**

     * 查询一类全部

     * @param cid

     * @param listId

@@ -88,5 +89,11 @@
     */

    public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId, int count);


	
     /* 根据标题查询

     * @param dtitle

     * @return

     */

    public List<DaTaoKeDetail> listByDtitle(String dtitle);



}


 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java

@@ -27,10 +27,7 @@
        System.out.println(resultJson);

        JSONArray array = resultJson.optJSONArray("result");

        for (int i = 0; i < array.size(); i++) {

            DaTaoKeDetail detail = gson.fromJson(array.optJSONObject(i).toString(), DaTaoKeDetail.class);

            if (detail != null && !detail.getPic().startsWith("http"))

                detail.setPic("https:" + detail.getPic());

            list.add(detail);

            list.add(gson.fromJson(array.optJSONObject(i).toString(), DaTaoKeDetail.class));

        }

        return new DaTaoKeApiResult(resultJson.optJSONObject("data").optInt("total_num"),

                resultJson.optJSONObject("data").optString("update_time"), list);


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

@@ -539,19 +539,5 @@
        desc += detail.getIntroduce();

        return desc;

    }

	
    public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {

        if (detail != null) {

            // 重新设置标题与券价格

            goods.setTitle(detail.getdTitle());

            goods.setCouponAmount(detail.getQuanPrice());

            if (new BigDecimal(detail.getQuanCondition()).compareTo(new BigDecimal(0)) > 0)

                goods.setCouponInfo(String.format("满%s元减%s元", detail.getQuanCondition(),

                        MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice()).toString()));

            else

                goods.setCouponInfo(String.format("%s元无条件券", detail.getQuanPrice()));

        }

        return goods;

    }



}