通用模板修改

admin

2019-08-19 e5e38de6745c8fcae91fa7e459898f3663d00001

通用模板修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -401,15 +401,15 @@
            

            case "recommendSearch":

                notify.put("name", "完成一次智能搜索");

                notify.put("score", "+20");

                notify.put("score", "+20金币");

                break;

            case "scanGoods":

                notify.put("name", "完成一次商品浏览");

                notify.put("score", "+10");

                notify.put("score", "+100金币");

                break;

            case "scanTBCart":

                notify.put("name", "完成一次购物车浏览");

                notify.put("score", "+30");

                notify.put("score", "+300金币");

                break;

            }




 fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java

@@ -4,7 +4,7 @@


    _9k9("9.9包邮"), haoQuan("高额好券"), chaoSheng("超级省钱"), muYin("母婴精选"), reMai("潮品热卖"), meiShi("优选美食"), juJia(

            "居家生活"), chuanYiDaPei("穿衣搭配"), meiZhuangGehu("美妆个护"), jingPinXieBao("精品鞋包"), chaoNanReMai(

                    "潮男热卖"), shuMaShouJi("数码手机"), yunDongKuXie("运动酷鞋"), qiCheHuWai("汽车户外"), chaoPinReMai("新款潮品");

                    "潮男热卖"), shuMaShouJi("数码手机"), yunDongKuXie("运动酷鞋"), qiCheHuWai("汽车户外"), chaoPinReMai("新款潮品"),mianDan("免单商品");

    private final String desc;



    private CommonContentTypeEnum(String desc) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java

@@ -3,13 +3,18 @@
import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.common.CommonContentNav;

import com.yeshi.fanli.dto.common.CommonContentResult;

import com.yeshi.fanli.dto.common.CommonContentTypeEnum;

@@ -17,8 +22,13 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;

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

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

@@ -30,6 +40,10 @@
import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

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

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

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Service

public class CommonTemplateContentServiceImpl implements CommonTemplateContentService {

@@ -130,6 +144,8 @@
            navList = getCommonNav();

        } else if (type == CommonContentTypeEnum.chaoPinReMai) {

            navList = getCommonNav();

        } else if (type == CommonContentTypeEnum.mianDan) {

            navList = getCommonNav();

        }



        return navList;

@@ -167,7 +183,10 @@
            result = getCaoShengContent(cid, page, pageSize);

        } else if (type == CommonContentTypeEnum.haoQuan) {

            result = getHaoQuanContent(cid, page, pageSize);

        } else if (type == CommonContentTypeEnum.mianDan) {

            result = getHaoQuanContent(cid, page, pageSize);

        }



        if (result != null) {// 商品信息过滤

            List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsUpdateService

                    .filterImportantTaoBaoGoods(result.getGoodsList());

@@ -654,4 +673,57 @@
        return new CommonContentResult(goodsList, count);

    }



    /**

     * 获取免单商品

     * 
     * @return

     */

    private CommonContentResult getMianDanContent(int page, int pageSize) {

        CommonContentResult result = new CommonContentResult();

        List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize);

        long count = qualityGoodsService.countFreeGoods();

        result.setCount(count);

        List<Long> listGid = new ArrayList<Long>();

        List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

        for (QualityFactory qualityFactory : listQuery) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();

            if (taoBaoGoodsBrief == null) {

                continue;

            }

            listGid.add(taoBaoGoodsBrief.getAuctionId());

            goodsList.add(taoBaoGoodsBrief);

        }

        // 去掉已经不在售的商品

        List<TaoBaoGoodsBrief> listTaoKeGoods = null;

        try {

            listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

        } catch (Exception e) {

            e.printStackTrace();

        }

        Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();

        for (TaoBaoGoodsBrief goods : listTaoKeGoods)

            goodsMap.put(goods.getAuctionId(), goods);

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

            if (goodsMap.get(goodsList.get(i).getAuctionId()) == null) {

                goodsList.remove(i--);

            }

        }

        // 过滤基本商品信息

        goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);



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

            TaoBaoGoodsBrief goods = goodsList.get(i);

            BigDecimal price = TaoBaoUtil.getAfterUseCouplePrice(goods);

            if (price.compareTo(new BigDecimal(10)) >= 0) {

                goodsList.remove(i--);

            }

        }

        result.setGoodsList(goodsList);

        return result;

    }



}