冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

冲突

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

@@ -21,6 +21,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

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



@Service

public class DaTaoKeGoodsDetailServiceImpl implements DaTaoKeGoodsDetailService {

@@ -95,7 +96,7 @@
            map.put(goods.getGoodsId(), goods);

        for (TaoBaoGoodsBrief goods : goodsList) {

            DaTaoKeDetail detail = map.get(goods.getAuctionId());

            goods = filterTaoBaoGoods(goods, detail);

            goods = DaTaoKeUtil.filterTaoBaoGoods(goods, detail);

        }

        return goodsList;

    }

@@ -110,22 +111,8 @@
            return goods;



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

        goods = filterTaoBaoGoods(goods, daTaoKeList.get(0));

        goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0));



        return goods;

    }



    private 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;

    }



@@ -139,4 +126,11 @@
    public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {

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

    }

	
    @Override

    public List<DaTaoKeDetail> listByDtitle(String dtitle) {



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

    }



}


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

@@ -57,5 +57,11 @@
     * @return

     */

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

	
     /* 根据标题查询

     * @param dtitle

     * @return

     */

    public List<DaTaoKeDetail> listByDtitle(String dtitle);



}