红包返利比例引用修改

admin

2018-12-10 35ab4226899cba623b38441250920b3773325518

红包返利比例引用修改

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -204,7 +204,7 @@
    @RequestMapping("coupon")

    public String conpon(Model model) {

        List<TaoBaoCoupon> couponList = taoBaoCouponService.getTaoBaoCouponList("", 1);

        String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        String jsonArr = Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(couponList));

        JSONArray jsonArray = JSONArray.fromObject(jsonArr);

        List<TaoBaoCoupon> collection = (List<TaoBaoCoupon>) JSONArray.toCollection(jsonArray, TaoBaoCoupon.class);

@@ -275,7 +275,7 @@
    @RequestMapping(value = "getConpon", method = RequestMethod.POST)

    public void getConpon(int page, PrintWriter out) {

        List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);

        String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        JSONObject data = new JSONObject();

        data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));

        data.put("proportion", proportion);

@@ -616,12 +616,9 @@
        }

        JSONObject data = new JSONObject();

        List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

        Map<String, String> map = hongBaoManageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {

            list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion,

                    fcRate, ""));

            list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion.toString(), ""));

        }



        Gson gson = JsonUtil.getApiCommonGson();


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

@@ -23,6 +23,7 @@
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.exception.HongBaoManageException;

import com.yeshi.fanli.service.MaskKeyService;

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

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

@@ -295,10 +296,10 @@
                return;

            }

            taoBaoGoodsBrief = taoBaoGoodsBriefs.get(0);

            String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

            BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();

            BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();

            BigDecimal tkp = new BigDecimal(proportion).divide(BigDecimal.valueOf(100))

            BigDecimal tkp = proportion.divide(BigDecimal.valueOf(100))

                    .multiply(tkRate.divide(BigDecimal.valueOf(100)));

            BigDecimal hongbao = MoneyBigDecimalUtil.mul(zkPrice, tkp);

            dynamicRecommend.setHongbao(hongbao);


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.apph5;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.Date;

import java.util.List;

import java.util.Map;

@@ -60,6 +61,9 @@


    @Resource

    private PushGoodsRecordService pushGoodsRecordService;

	
    @Resource

    private HongBaoManageService hongBaoManageService;



    /**

     * 推送商品详情页

@@ -92,8 +96,7 @@
            if (list != null && list.size() > 0) {



                Map<String, String> map = manageService.convertMap();

                String proportion = map.get("hongbao_goods_proportion");

                String fcRate = map.get("hongbao_fc_ratio");

                BigDecimal proportion = hongBaoManageService.getFanLiRate();



                for (PushGoodsGroup pushGoodsGroup : list) {

                    CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();

@@ -117,7 +120,7 @@
                        commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));

                    }



                    array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate, null)));

                    array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));

                }

            }




 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.apph5;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.List;

import java.util.Map;



@@ -81,6 +82,9 @@


    @Resource

    private CollectionGoodsV2Service collectionGoodsV2Service;



    @Resource

    private HongBaoManageService hongBaoManageService;



    /**

     * 9.9商品

@@ -208,8 +212,7 @@
                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        /* 遍历列表数据 */

        for (QualityFactory selectionGoods : listQuery) {



@@ -234,7 +237,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -370,9 +373,7 @@
        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        /* 遍历列表数据 */

        for (QualityFactory selectionGoods : listQuery) {



@@ -397,7 +398,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -645,9 +646,7 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                    .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



            Map<String, String> map = manageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            BigDecimal proportion =manageService.getFanLiRate();



            /* 遍历列表数据 */

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : listMaterial) {

@@ -677,7 +676,7 @@
                }



                TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion, fcRate, null);

                        proportion.toString(), null);

                taoBaoGoodsBriefExtra.setCollected(collected);



                array.add(gson.toJson(taoBaoGoodsBriefExtra));

@@ -822,9 +821,7 @@
        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();



        /* 遍历列表数据 */

        for (TaoBaoGoodsBrief taoBaoGoodsBrief : listBrands) {

@@ -844,7 +841,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -886,9 +883,7 @@
        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();



        // 遍历列表数据

        for (QualityFactory quality : listQuery) {

@@ -914,7 +909,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -974,10 +969,7 @@
        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");



        BigDecimal proportion = manageService.getFanLiRate();

        // 遍历列表数据

        for (QualityFactory selectionGoods : listQuery) {



@@ -1002,7 +994,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -1045,19 +1037,16 @@


        double tkRate = 20.00;



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");



        BigDecimal proportion = manageService.getFanLiRate();

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

                proportion, startAmount, endAmount, tkRate);

                proportion.toString(), startAmount, endAmount, tkRate);



        if (listQuery == null || listQuery.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "没有更多了"));

            return;

        }



        long count = qualityGoodsService.countQueryByRebateAmount(proportion, startAmount, endAmount, tkRate);

        long count = qualityGoodsService.countQueryByRebateAmount(proportion.toString(), startAmount, endAmount, tkRate);



        // 精选库数据处理返回 前端

        JSONArray array = new JSONArray();

@@ -1088,7 +1077,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -1114,18 +1103,15 @@


        int pageSize = Constant.PAGE_SIZE;



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");



        JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);

        BigDecimal proportion = manageService.getFanLiRate();

        JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());



        if (array == null) {

            out.print(JsonUtil.loadFalseResult("没有更多了"));

            return;

        }



        long count = qualityGoodsService.countRecommendToIndex(proportion);

        long count = qualityGoodsService.countRecommendToIndex(proportion.toString());



        JSONObject data = new JSONObject();

        data.put("count", count);


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

@@ -31,6 +31,7 @@
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.exception.HongBaoManageException;

import com.yeshi.fanli.service.MaskKeyService;

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

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

@@ -390,10 +391,11 @@
                return;

            }

            taoBaoGoodsBrief = taoBaoGoodsBriefs.get(0);

            String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

			
            BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();

            BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();

            BigDecimal tkp = new BigDecimal(proportion).divide(BigDecimal.valueOf(100))

            BigDecimal tkp = proportion.divide(BigDecimal.valueOf(100))

                    .multiply(tkRate.divide(BigDecimal.valueOf(100)));

            BigDecimal hongbao = MoneyBigDecimalUtil.mul(zkPrice, tkp);

            dynamicRecommend.setHongbao(hongbao);


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

@@ -33,6 +33,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

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

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

import com.yeshi.fanli.exception.HongBaoManageException;

import com.yeshi.fanli.log.LogHelper;

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

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

@@ -326,9 +327,7 @@
                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

        JSONArray array = new JSONArray();

        List<TaoBaoGoodsBrief> taobaoList = taoKeGoodsService.searchWuLiaoList(sf);

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taobaoList) {

            int biz30day = taoBaoGoodsBrief.getBiz30day();

            if (biz30day >= 10000) {

@@ -338,7 +337,7 @@
            } else {

                taoBaoGoodsBrief.setSalesCount(biz30day + "");

            }

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }

        JSONObject data = new JSONObject();

        data.put("nav", new JSONArray());

@@ -610,9 +609,7 @@
        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();



        // 遍历列表数据

        for (QualityFactory selectionGoods : listQuery) {

@@ -632,7 +629,7 @@
                taoBaoGoodsBrief.setSalesCount(biz30day + "");

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



        JSONObject data = new JSONObject();

@@ -686,15 +683,13 @@
    public void getCouponList(AcceptData acceptData, int page, HttpServletRequest request, PrintWriter out) {

        page = page > 0 ? page : 1;

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = taoBaoCouponService.getTaoBaoCouponList(page);

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        JSONArray array = new JSONArray();

        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();



        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            array.add(gson.toJson(taoBaoGoodsBriefExtra));

        }

        int count = 10000;

@@ -775,12 +770,10 @@
        data.put("nav", gson.toJson(navList));

        List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            re.add(taoBaoGoodsBriefExtra);

        }



@@ -805,9 +798,10 @@
     */

    private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {

        if (taoBaoCoupons.size() > 0) {

            String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

            BigDecimal proportion= hongBaoManageService.getFanLiRate();

			
            for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon,proportion);

                taoBaoCoupon.setHongbao(hb);

            }

        }


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

@@ -11,9 +11,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

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

@@ -107,6 +104,9 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

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

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/v1/user")

@@ -213,10 +213,10 @@


    @Resource

    private CommonGoodsService commonGoodsService;

	


    @Resource

    private UserGoodsStorageService userGoodsStorageService;

 


    @RequestMapping(value = "getrecommendsection")

    public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {



@@ -259,10 +259,7 @@
        JSONObject validData = null;

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

        Map<String, String> convertMap = hongBaoManageService.convertMap();

        String proportion = convertMap.get("hongbao_goods_proportion");

        String fcRate = convertMap.get("hongbao_fc_ratio");



        BigDecimal proportion = manageService.getFanLiRate();

        Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();

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

            validData = new JSONObject();

@@ -285,7 +282,7 @@
                JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));

                String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(

                        gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),

                        proportion, fcRate, ""));

                        proportion.toString(), ""));

                obj.put("taoBaoGoodsBrief", json);

                array.add(obj);

            }

@@ -534,15 +531,13 @@
            }

        }



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        JSONArray array = new JSONArray();

        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();



        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            array.add(gson.toJson(taoBaoGoodsBriefExtra));

        }

        JSONObject data = new JSONObject();

@@ -962,8 +957,8 @@
        goods.put("price", tb.getReservePrice().toString());

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



        String rateStr = hongBaoManageService.get("hongbao_goods_proportion");

        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));

        BigDecimal proportion = manageService.getFanLiRate();

        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

        goods.put("hongBao", hongBao);



        // 30天销量

@@ -1213,15 +1208,13 @@


        List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();



        Map<String, String> map = hongBaoManageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        if (recommendGoodsList != null)

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) {

                if (taoBaoGoodsBrief == null)

                    continue;



                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));

            }

        out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re)));

    }

@@ -1296,12 +1289,11 @@
        Gson gson = JsonUtil.getApiCommonGson();

        if (list != null) {

            Map<String, String> map = hongBaoManageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            BigDecimal proportion = manageService.getFanLiRate();

            for (ScanHistoryV2 sh : list) {

                TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());

                goods.setId(sh.getId());

                array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "")));

                array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));

            }

        }

        data.put("data", array);

@@ -1408,11 +1400,10 @@
        if (page <= 1) {

            array.clear();

            Map<String, String> map = hongBaoManageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            BigDecimal proportion = manageService.getFanLiRate();

            if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {

                long startTime = java.lang.System.currentTimeMillis();

				


                TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);



                if (result != null && result.getTaoBaoGoodsBriefs() != null) {

@@ -1435,7 +1426,7 @@
                    Collections.shuffle(goodsList);

                    goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;

                    for (TaoBaoGoodsBrief goods : goodsList) {

                        array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "")));

                        array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));

                    }

                } else {

                    try {

@@ -1446,19 +1437,18 @@
                    }

                }

            }

            JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion,

                    fcRate);

            JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,

                    proportion.toString());

            array.addAll(localArray);

        } else {// 从精选库来

            Map<String, String> map = hongBaoManageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);

            BigDecimal proportion = manageService.getFanLiRate();

            array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());

            if (array == null) {

                out.print(JsonUtil.loadFalseResult("没有更多了"));

                return;

            }

            long count = qualityGoodsService.countRecommendToIndex(proportion);

            long count = qualityGoodsService.countRecommendToIndex(proportion.toString());

        }



        JSONObject data = new JSONObject();

@@ -1864,8 +1854,8 @@
        goods.put("zkPrice", tb.getZkPrice().toString());



        // 红包

        String rateStr = hongBaoManageService.get("hongbao_goods_proportion");

        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));

        BigDecimal proportion = manageService.getFanLiRate();

        String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

        goods.put("hongBao", hongBao);

        // 30天销量

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

@@ -1965,12 +1955,12 @@
        // 分享路径

        String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());



        // 是否加入选品库：   0未加入 1 已加入

        // 是否加入选品库： 0未加入 1 已加入

        boolean storageState = false;

        if (uid != null && uid.trim().length() > 0) {

            storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));

        }

		


        data.put("storageState", storageState);

        data.put("shareUrl", shareUrl);

        data.put("goods", goods);

@@ -2118,9 +2108,7 @@
            }

        }



        Map<String, String> map = hongBaoManageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();



        List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();



@@ -2134,7 +2122,7 @@
            }



            if (taoBaoGoodsBrief != null) {

                listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));

                listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));

            }



        });

@@ -2167,7 +2155,7 @@
                        taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

                    }



                    listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));

                    listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

                }

            }

        } catch (Exception e2) {


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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.List;

import java.util.Map;



@@ -99,14 +100,12 @@
        List<TaoBaoGoodsBrief> list = s11Service.getPreSaleGoodsCache(page);

        JSONArray array = new JSONArray();

        if (list != null) {

            Map<String, String> map = hongBaoManageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();

            boolean is11 = System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2018-11-11", "yyyy-MM-dd") ? true

                    : false;

            for (TaoBaoGoodsBrief goods : list) {

                TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "");

                TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");

                if (!is11)

                    extra.setShopType(3);

                array.add(gson.toJson(extra));

@@ -123,14 +122,12 @@
        List<TaoBaoGoodsBrief> list = s11Service.getPreSaleGoodsByType(key, page);

        JSONArray array = new JSONArray();

        if (list != null) {

            Map<String, String> map = hongBaoManageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();

            boolean is11 = System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2018-11-11", "yyyy-MM-dd") ? true

                    : false;

            for (TaoBaoGoodsBrief goods : list) {

                TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "");

                TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");

                if (!is11)

                    extra.setShopType(3);

                array.add(gson.toJson(extra));


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

@@ -59,10 +59,10 @@


    @Resource

    private SystemService systemService;

	


    @Resource

    private ConfigService configService;

	


    @Resource

    private SuperHotSearchService superHotSearchSerivce;



@@ -140,11 +140,9 @@
        data.put("nav", gson.toJson(navList));

        List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        for (TaoBaoGoodsBrief bf : taoBaoGoodsBriefs) {

            re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

            re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

        }

        Gson gson2 = JsonUtil.getApiCommonGson();

        data.put("result", gson2.toJson(re));

@@ -315,9 +313,7 @@
        int fq = sf.getQuan();

        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        if (fq == 0 && fh == 0 && !ft) {

            if (result != null && result.getTaoBaoGoodsBriefs() != null)

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

@@ -326,10 +322,10 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        bf.setSalesCount(salesCountMidea + "万");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    } else {

                        bf.setSalesCount(count + "");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    }

                }

        } else {

@@ -341,13 +337,13 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    } else {

                        taoBaoGoodsBrief.setSalesCount(count + "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    }

                }

@@ -520,7 +516,7 @@
        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(endprice)) {

            sf.setEndPrice(new BigDecimal(endprice));

        }

		


        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(order)) {

            if (Integer.parseInt(order) == 1) {

                sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);

@@ -617,11 +613,11 @@
                    setSearchTkRate(3, sf);

                } else if ("tkRate5".equalsIgnoreCase(ty)) {

                    setSearchTkRate(4, sf);

                } 
                }

            }

            sf.setParams(params);

        }

		


        TaoBaoSearchResult result = TaoBaoUtil.search(sf);

        if (result == null) {

            return null;

@@ -639,8 +635,7 @@
        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        if (fq == 0 && fh == 0 && !ft) {

            if (result != null && result.getTaoBaoGoodsBriefs() != null)

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

@@ -649,10 +644,10 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        bf.setSalesCount(salesCountMidea + "万");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    } else {

                        bf.setSalesCount(count + "");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    }

                }

        } else {

@@ -664,13 +659,13 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    } else {

                        taoBaoGoodsBrief.setSalesCount(count + "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    }

                }

@@ -694,7 +689,7 @@
     * @return

     */

    private JSONObject searchQualityGoods(String key, int page, String filter, String order, String startprice,

            String endprice ) {

            String endprice) {



        Integer hasQuan = null;

        Integer userType = null;

@@ -703,7 +698,7 @@
        Integer sort = null;

        Double startTkRate = null;

        Double endTkRate = null;

		


        int provinceId = -100;



        // 起始价格

@@ -821,7 +816,7 @@
                            }

                        }

                    }

                } 
                }

            }

        }



@@ -831,10 +826,7 @@
                userType, start_Price, end_Price, startTkRate, endTkRate, sort);



        List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");



        BigDecimal proportion = manageService.getFanLiRate();

        /* 遍历列表数据 */

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

            for (QualityFactory selectionGoods : listQuery) {

@@ -860,11 +852,12 @@
                    taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

                }



                listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));

                listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

            }

        }



        long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price, startTkRate, endTkRate);

        long count = qualityGoodsService.countRecommendBykey(key, hasQuan, userType, start_Price, end_Price,

                startTkRate, endTkRate);



        // 设置发货地址

        TaoBaoSearchNav nav = new TaoBaoSearchNav();

@@ -904,33 +897,34 @@


    /**

     * 设置查询佣金比例范围

     * 
     * @param i

     * @param sf

     */

    public void setSearchTkRate(int i, SearchFilter sf) {

        // 获取对应参数

        String value = configService.get("tkRate_range");

		


        if (!StringUtil.isNullOrEmpty(value)) {

			


            JSONArray tkRatearray = JSONArray.fromObject(value);

			


            if (tkRatearray != null) {

				


                String start = tkRatearray.optJSONObject(i).optString("start");

				


                if (!StringUtil.isNullOrEmpty(start)) {

                    int tkRate = (int) (Float.parseFloat(start) * 100);

                    sf.setStartTkRate(tkRate);

                }

				


                String end = tkRatearray.optJSONObject(i).optString("end");

                if (!StringUtil.isNullOrEmpty(end)) {

                    int tkRate = (int) (Float.parseFloat(end) * 100);

                    sf.setEndTkRate(tkRate);

                }

            }

			


        }

    }

}


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

@@ -127,7 +127,7 @@
            data.put("notifyDesc", configService.get("goods_share_notify"));



            // 添加分享记录

            BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));

            BigDecimal rate =hongBaoManageService.getFanLiRate();

            UserShareGoodsHistory history = new UserShareGoodsHistory();

            history.setTkCode(taoBaoLink.getTaoToken());

            history.setLink(taoBaoLink.getClickUrl());


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

@@ -1505,15 +1505,13 @@
        // collectionGoodsService.findCollectionGoods(uid, page + 1);

        long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

        JSONObject data = new JSONObject();

        Map<String, String> map = hongBaoManageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

        collectionGoodsList.parallelStream().forEachOrdered(cg -> {

            TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());

            goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,

                    fcRate, "");

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

                    proportion.toString(), "");

            taoBaoGoodsBriefExtra.setCreatetime(cg.getCreateTime());

            list.add(taoBaoGoodsBriefExtra);

        });


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5GoodsClassController.java

@@ -7,12 +7,10 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -22,11 +20,10 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.Utils;

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/h5/v1/class")

@@ -51,15 +48,13 @@
    public void getCouponList(AcceptData acceptData, String callback, int page, PrintWriter out) {

        page = page > 0 ? page : 1;

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = taoBaoCouponService.getTaoBaoCouponList(page);

        Map<String, String> map = hongBaoManageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        JSONArray array = new JSONArray();

        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();



        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            array.add(gson.toJson(taoBaoGoodsBriefExtra));

        }

        int count = 10000;

@@ -76,9 +71,10 @@
     */

    private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {

        if (taoBaoCoupons.size() > 0) {

            String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

			
            for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon,proportion);

                taoBaoCoupon.setHongbao(hb);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -198,9 +198,7 @@
        JSONObject validData = null;

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

        Map<String, String> convertMap = hongBaoManageService.convertMap();

        String proportion = convertMap.get("hongbao_goods_proportion");

        String fcRate = convertMap.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();



        Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();

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

@@ -224,7 +222,7 @@
                JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));

                String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(

                        gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),

                        proportion, fcRate, ""));

                        proportion.toString(), ""));

                obj.put("taoBaoGoodsBrief", json);

                array.add(obj);

            }


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java

@@ -247,17 +247,15 @@
        int fq = sf.getQuan();

        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        if (fq == 0 && fh == 0 && !ft) {

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

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

            }

        } else {

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

                re.add(taoBaoGoodsBriefExtra);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java

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


import com.yeshi.fanli.entity.accept.AcceptData;

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

import com.yeshi.fanli.exception.HongBaoManageException;

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

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

import com.yeshi.fanli.util.Constant;

@@ -25,18 +26,18 @@
@Controller

@RequestMapping("api/web/v1/class")

public class WebGoodsClassController {

	


    @Resource

    private TaoBaoCouponService taoBaoCouponService;

	


    @Resource

    private HongBaoManageService hongBaoManageService;

	


    /**

     * 

     * 方法说明: 获取优惠券页面商品列表

     * @author mawurui

     * createTime 2018年5月11日 下午2:41:16

     * 
     * @author mawurui createTime 2018年5月11日 下午2:41:16

     * @param acceptData

     * @param page

     * @param out

@@ -52,7 +53,7 @@
        data.put("count", count);

        out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

    }

	


    /**

     * 设置红包进去

     * 

@@ -60,9 +61,9 @@
     */

    private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {

        if (taoBaoCoupons.size() > 0) {

            String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

            for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, proportion);

                taoBaoCoupon.setHongbao(hb);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.web;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

@@ -190,9 +191,7 @@
        JSONArray dataArr = new JSONArray();

        JSONObject validData = null;

        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

        Map<String, String> convertMap = hongBaoManageService.convertMap();

        String proportion = convertMap.get("hongbao_goods_proportion");

        String fcRate = convertMap.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();



        Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();

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

@@ -216,7 +215,7 @@
                JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));

                String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(

                        gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),

                        proportion, fcRate, ""));

                        proportion.toString(), ""));

                obj.put("taoBaoGoodsBrief", json);

                array.add(obj);

            }


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java

@@ -248,16 +248,15 @@
        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();

        if (fq == 0 && fh == 0 && !ft) {

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

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

            }

        } else {

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

                re.add(taoBaoGoodsBriefExtra);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java

@@ -327,9 +327,9 @@
     */

    private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {

        if (taoBaoCoupons.size() > 0) {

            String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);

            BigDecimal proportion = hongBaoManageService.getFanLiRate();

            for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));

                BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, proportion);

                taoBaoCoupon.setHongbao(hb);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java

@@ -238,13 +238,11 @@
        List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion =manageService.getFanLiRate();



        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            re.add(taoBaoGoodsBriefExtra);

        }



@@ -277,12 +275,11 @@
        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion =manageService.getFanLiRate();



        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

            re.add(taoBaoGoodsBriefExtra);

        }



@@ -395,16 +392,15 @@
        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();

        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion =manageService.getFanLiRate();

        if (fq == 0 && fh == 0 && !ft) {

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

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

            }

        } else {

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

                re.add(taoBaoGoodsBriefExtra);

            }

        }


 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

@@ -400,14 +400,12 @@
        List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);

        long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

        JSONObject data = new JSONObject();

        Map<String, String> map = hongBaoManageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

        coList.parallelStream().forEachOrdered(cg -> {

            TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,

                    fcRate, "");

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

                    proportion.toString(), "");

            list.add(taoBaoGoodsBriefExtra);

        });

        int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoManageMapper.java

@@ -1,5 +1,7 @@
package com.yeshi.fanli.dao.mybatis;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.entity.bus.user.HongBaoManage;

public interface HongBaoManageMapper {
@@ -17,4 +19,13 @@
    int updateByPrimaryKeySelective(HongBaoManage record);

    int updateByPrimaryKey(HongBaoManage record);

    /**
     * 按最大有效时间搜索红包对象
     * 
     * @param key
     * @param timeStamp
     * @return
     */
    HongBaoManage selectByKeyAndMaxValidTime(@Param("key")String key,@Param("timeStamp") long timeStamp);
}

 fanli/src/main/java/com/yeshi/fanli/mapping/HongBaoManageMapper.xml

@@ -21,9 +21,26 @@
        parameterType="java.lang.String">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_hongbao_manage where `key` = #{0}
        from yeshi_ec_hongbao_manage where `key` = #{0} order by validtime
        desc limit 1
    </select>


    <select id="selectByKeyAndMaxValidTime" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_hongbao_manage where `key` = #{key} and
        UNIX_TIMESTAMP(validtime)*1000
        <![CDATA[
        <=
        ]]>
        #{timeStamp} order by validtime desc limit 1
    </select>





    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_hongbao_manage where id = #{id,jdbcType=BIGINT}
    </delete>

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

@@ -30,6 +30,7 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

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

@@ -77,6 +78,9 @@


    @Resource

    private UserAccountService userAccountService;

	
    @Resource

    private HongBaoManageService hongBaoManageService;



    @Override

    public void addShareGoodsHistory(UserShareGoodsHistory history) {

@@ -136,7 +140,8 @@
        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && StringUtil.isNullOrEmpty(goods.getAuctionUrl())) {

            throw new ShareGoodsException(10, "转链失败");

        }

        BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());

		
        BigDecimal rate = hongBaoManageService.getShareRate();



        // 创建淘口令

        TaoBaoLink tbLink = new TaoBaoLink(); // TaoBaoUtil.getTbLinkForShare(goods.getAuctionId(),


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

@@ -299,36 +299,32 @@


    @Override

    public String getGoodsUserHongBao(TaoBaoGoodsBrief goods) {

        Map<String, String> convertMap = hongBaoManageService.convertMap();

        String proportion = convertMap.get("hongbao_goods_proportion");

        return TaoBaoUtil.getGoodsHongBaoInfo(goods, new BigDecimal(proportion));

        BigDecimal rate = hongBaoManageService.getFanLiRate();

        return TaoBaoUtil.getGoodsHongBaoInfo(goods, rate);

    }



    @Override

    public BigDecimal getShareGoodsUserHongBao(TaoBaoGoodsBrief goods) {

        Map<String, String> convertMap = hongBaoManageService.convertMap();

        String proportion = convertMap.get("hongbao_goods_proportion");

        return TaoBaoUtil.getShareGoodsHongBaoInfo(goods, new BigDecimal(proportion));

        BigDecimal rate = hongBaoManageService.getShareRate();

        return TaoBaoUtil.getShareGoodsHongBaoInfo(goods, rate);

    }



    @Override

    public List<TaoBaoGoodsBrief> queryByAuctionId(Long auctionId) {

        return taoBaoGoodsBriefMapper.queryByAuctionId(auctionId);

    }

	


    @Override

    public List<TaoBaoGoodsBrief> listQueryByAuctionId(List<Long> list) {

        return taoBaoGoodsBriefMapper.queryGoodsByAuctionId(list);

    }

	
	


    @Override

    public int insertSelective(TaoBaoGoodsBrief taoBaoGoodsBrief) {



        return taoBaoGoodsBriefMapper.insertSelective(taoBaoGoodsBrief);

    }

	


    @Override

    public int insertBatch(List<TaoBaoGoodsBrief> list) {



@@ -344,8 +340,7 @@
    public int updateByPrimaryKey(TaoBaoGoodsBrief taoBaoGoodsBrief) {

        return taoBaoGoodsBriefMapper.updateByPrimaryKey(taoBaoGoodsBrief);

    }

	
	


    @Override

    public void updateTBGoodsWithNewInfo(TaoBaoGoodsBrief tb) throws NotExistObjectException {

        if (tb == null)

@@ -478,7 +473,7 @@


        if (goodsBrief.getZkPrice() == null)

            goodsBrief.setZkPrice(defaultZero);

		


    }



    @Override

@@ -515,10 +510,9 @@
        return taoBaoGoodsBrief;

    }



	
    @Override

    public void updateBatchSelective(List<TaoBaoGoodsBrief> list) {

         taoBaoGoodsBriefMapper.updateBatchSelective(list);

        taoBaoGoodsBriefMapper.updateBatchSelective(list);

    }

	


}


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.hongbao;



import java.math.BigDecimal;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

@@ -15,7 +16,9 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.hongbao.HongBaoManageDao;

import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.entity.bus.user.HongBaoManage;

import com.yeshi.fanli.log.LogHelper;

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



@Service

@@ -23,6 +26,9 @@


    @Resource

    private HongBaoManageDao hongBaoManageDao;



    @Resource

    private HongBaoManageMapper hongBaoManageMapper;



    public List<HongBaoManage> getHongBaoManage() {

        List<HongBaoManage> list = hongBaoManageDao.list("from HongBaoManage");

@@ -61,4 +67,39 @@
        return map;

    }



    @Override

    public BigDecimal getFanLiRate(long time) {

        String key = "hongbao_goods_proportion";



        HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, time);

        if (hongBaoManage == null)

            hongBaoManage = hongBaoManageMapper.selectByKey(key);

        if (hongBaoManage != null)

            return new BigDecimal(hongBaoManage.getValue());

        LogHelper.error("获取返利分成比例出错");

        return null;

    }



    @Override

    public BigDecimal getShareRate(long time) {

        String key = "share_proportion";

        HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, time);

        if (hongBaoManage == null)

            hongBaoManage = hongBaoManageMapper.selectByKey(key);

        if (hongBaoManage != null)

            return new BigDecimal(hongBaoManage.getValue());

        LogHelper.error("获取分享赚分成比例出错");

        return null;

    }



    @Override

    public BigDecimal getFanLiRate() {

        return getFanLiRate(System.currentTimeMillis());

    }



    @Override

    public BigDecimal getShareRate() {

        return getShareRate(System.currentTimeMillis());

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java

@@ -870,8 +870,8 @@


    @Transactional

    public void updateHongBao(HongBao hongBao, TaoBaoOrder taoBaoOrder) {

        BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue())

                .divide(new BigDecimal(100));

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        BigDecimal rate = proportion.divide(new BigDecimal(100));

        // 更新红包项

        HongBao updateHongBao = new HongBao();

        updateHongBao.setId(hongBao.getId());

@@ -981,8 +981,8 @@
    public void addHongBao(Order order, TaoBaoOrder taoBaoOrder, Long orderItemId) {

        OrderItem orderItem = orderItemMapper.selectByPrimaryKey(orderItemId);

        // 订单返利比例

        BigDecimal baseRate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue())

                .divide(new BigDecimal(100));

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        BigDecimal baseRate = proportion.divide(new BigDecimal(100));



        // 创建红包

        JSONObject data = new JSONObject();


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java

@@ -260,8 +260,8 @@
     * 首页最底部@商品信息流

     */

    @Override

    @Cacheable(value = "qualityCache",key="'listQueryToRecommend-'+#start+'-'+#proportion+'-'+#fcRate")

    public JSONArray getRecommendToIndex(long start, int count, String proportion, String fcRate) {

    @Cacheable(value = "qualityCache",key="'listQueryToRecommend-'+#start+'-'+#proportion")

    public JSONArray getRecommendToIndex(long start, int count, String proportion) {

        

        // 返利金额2元以上；

        Integer commision = 2; 

@@ -311,7 +311,7 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }

            

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, null)));

        }



        return array;


 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java

@@ -42,10 +42,9 @@


    @Resource

    private TaoBaoShopService taoBaoShopService;

	


    @Resource

    private QualityGoodsService qualityGoodsService;

	


    @Cacheable(value = "taoKeMaterialCache", key = "'listByMaterial-'+#materialId +'-'+#pageIndex")

    @Override

@@ -80,8 +79,8 @@
                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");



        BigDecimal proportion = manageService.getFanLiRate();



        listGoods.parallelStream().forEach(taoBaoGoodsBrief -> {



@@ -119,8 +118,8 @@
                taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

            }



            arrayGoods

                    .add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            arrayGoods.add(

                    gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));



        });



@@ -209,8 +208,7 @@
        boolean ft = sf.isTmall();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();



        if (fq == 0 && fh == 0 && !ft) {

            if (result != null && result.getTaoBaoGoodsBriefs() != null)

@@ -229,10 +227,10 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        bf.setSalesCount(salesCountMidea + "万");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    } else {

                        bf.setSalesCount(count + "");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    }

                }

        } else {

@@ -254,13 +252,13 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    } else {

                        taoBaoGoodsBrief.setSalesCount(count + "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    }

                }

@@ -286,8 +284,7 @@


        return result.getTaoBaoGoodsBriefs();

    }

	
	


    @Override

    public JSONObject listByWuLiao(int page, String key, String cateIds, String filterParams, String order,

            String startprice, String endprice, String searchParam) {

@@ -418,9 +415,7 @@
        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal proportion = manageService.getFanLiRate();



        if (fq == 0 && fh == 0 && !ft) {

            if (result != null && result.getTaoBaoGoodsBriefs() != null)

@@ -430,10 +425,10 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        bf.setSalesCount(salesCountMidea + "万");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    } else {

                        bf.setSalesCount(count + "");

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));

                        re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

                    }

                }

        } else {

@@ -445,13 +440,13 @@
                        double sales = count;

                        String salesCountMidea = String.format("%.1f", sales / 10000);

                        taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    } else {

                        taoBaoGoodsBrief.setSalesCount(count + "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                fcRate, "");

                        taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                                proportion.toString(), "");

                        re.add(taoBaoGoodsBriefExtra);

                    }

                }

@@ -465,13 +460,11 @@


        return data;

    }

	
	
    @Override

    public void setSearchFilter(SearchFilter searchfilter, String filter, String order,

            String startprice, String endprice, String fastFilter, Integer totalSales) {



		
    @Override

    public void setSearchFilter(SearchFilter searchfilter, String filter, String order, String startprice,

            String endprice, String fastFilter, Integer totalSales) {



        if (!StringUtil.isNullOrEmpty(startprice)) {

            searchfilter.setStartPrice(new BigDecimal(startprice));

        }

@@ -512,8 +505,7 @@
                }

            }

        }

		
		


        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(order)) {

            if (Integer.parseInt(order) == 1 || Integer.parseInt(order) == 0) {

                searchfilter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);

@@ -529,60 +521,55 @@
        } else {

            searchfilter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);

        }

		


    }



	
    @Override

    @Cacheable(value = "qualityCache",key="'countByQuality-'+#start+'-'+#searchKey+'-'+#systemCid+'-'+#listLabId")

    public List<QualityFactory> queryByQuality(long start, int count,String searchKey, Long systemCid,

    @Cacheable(value = "qualityCache", key = "'countByQuality-'+#start+'-'+#searchKey+'-'+#systemCid+'-'+#listLabId")

    public List<QualityFactory> queryByQuality(long start, int count, String searchKey, Long systemCid,

            List<Long> listLabId) {

		


        /* 1、 精选库筛选 */

        List<QualityFactory> listQuality = null;

		


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

            // 含标签

            listQuality = qualityGoodsService.listQueryByKeyAndlabIDs(start, count, searchKey,

                    listLabId, null, systemCid, null, null, null, null, null);

        } else {

            listQuality = qualityGoodsService.listQueryByKey(start, count, searchKey, null,

            listQuality = qualityGoodsService.listQueryByKeyAndlabIDs(start, count, searchKey, listLabId, null,

                    systemCid, null, null, null, null, null);

        } else {

            listQuality = qualityGoodsService.listQueryByKey(start, count, searchKey, null, systemCid, null, null, null,

                    null, null);

        }

		


        return listQuality;

    }



	
    @Override

    @Cacheable(value = "qualityCache",key="'countByQuality-'+#searchKey+'-'+#systemCid+'-'+#listLabId")

    @Cacheable(value = "qualityCache", key = "'countByQuality-'+#searchKey+'-'+#systemCid+'-'+#listLabId")

    public long countByQuality(String searchKey, Long systemCid, List<Long> listLabId) {

		


        long incount = 0;

		


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

            // 含标签

            incount = qualityGoodsService.countQueryKeyAndlabIDs(searchKey, listLabId, systemCid, 
                    null, null, null, null, null);

            incount = qualityGoodsService.countQueryKeyAndlabIDs(searchKey, listLabId, systemCid, null, null, null,

                    null, null);

        } else {

            incount = qualityGoodsService.countQueryByKey(searchKey, systemCid, null, null, null, null, null);

        }

		


        return incount;

    }







    @Override

    public JSONObject listQualityGoods(List<QualityFactory> listQuality, List<TaoBaoGoodsBrief> searchWuLiaoList, 
            Map<String, String> map ) {

		
    public JSONObject listQualityGoods(List<QualityFactory> listQuality, List<TaoBaoGoodsBrief> searchWuLiaoList,

            Map<String, String> map) {



        JSONArray array = new JSONArray();

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

		
        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");



        BigDecimal proportion = manageService.getFanLiRate();



        /* 遍历列表数据 */

        for (QualityFactory selectionGoods : listQuality) {

@@ -602,7 +589,7 @@
                taoBaoGoodsBrief.setSalesCount(biz30day + "");

            }



            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

        }



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

@@ -620,7 +607,7 @@
                }



                array.add(gson

                        .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));

                        .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

            }

        }



@@ -631,8 +618,8 @@
        data.put("nav", gsonBuilder.toJson(navList));

        data.put("count", 5000);

        data.put("result", array);

		


        return data;

    }

	


}


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java

@@ -270,7 +270,7 @@


    @Override

    public void synOldOrder(List<TaoBaoOrder> tborderList) {

        BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));

        BigDecimal  rate = hongBaoManageService.getFanLiRate();

        Map<String, Order> map = new HashMap<String, Order>();

        tborderList.stream().forEach((tbo) -> {

            Order order = map.get(tbo.getOrderId());

@@ -307,7 +307,7 @@
    @Override

    public void processOrderItem(String orderId, List<TaoBaoOrder> orderList) {

        List<OrderItem> orderItemList = orderItemMapper.findOrderByOrderIdAndTypeAndVersion(orderId, 1, 2);

        BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());

        BigDecimal  rate = hongBaoManageService.getFanLiRate();

        Order order = orderMapper.selectOrderByOrderId(orderId);

        // 尚未插入子订单

        if (orderItemList == null || orderItemList.size() == 0) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -45,6 +45,7 @@
import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

@@ -135,6 +136,9 @@


    @Resource

    private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;

	
    @Resource

    private HongBaoManageService hongBaoManageService;



    @Override

    public void processOrder(Map<String, List<TaoBaoOrder>> orders) {

@@ -417,7 +421,7 @@
            orderMapper.updateByPrimaryKeySelective(updateOrder);

            Order order = oldOrder;

            // 订单返利比例

            BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());

            BigDecimal  rate = hongBaoManageService.getFanLiRate();



            // 查找是否存在红包

            List<HongBao> hongBaoList = hongBaoMapper.selectByOid(order.getId());


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java

@@ -252,8 +252,7 @@
    @Override

    @Transactional

    public void doPidOrder(String orderId) {

        Map<String, String> convertMap = hongBaoManageService.convertMap();

        BigDecimal rate = new BigDecimal(convertMap.get("hongbao_goods_proportion")).divide(new BigDecimal(100));

        BigDecimal  rate = hongBaoManageService.getFanLiRate();



        List<PidOrder> orders = pidOrderMapper.getPidOrderListByOrderId(orderId);

        // 只看有用户Id的情况


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java

@@ -254,7 +254,7 @@
            caLatest.setTimeInMillis(latest.getCreateTime().getTime());

            Calendar nowLatest = Calendar.getInstance();

            if (caLatest.get(Calendar.MONTH) == nowLatest.get(Calendar.MONTH))// 上次更改和现在是同一个月

                throw new BindingAccountException(2, "本月支付宝绑定次数超限");

                throw new BindingAccountException(2, "每月仅可修改1次提现账号，请下月再试吧。");

        }

        return true;

    }


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user;



import java.io.Serializable;

import java.math.BigDecimal;

import java.math.BigInteger;

import java.util.ArrayList;

import java.util.Calendar;

@@ -216,12 +217,9 @@
                        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();

                        List<TaoBaoGoodsBriefExtra> tbbeList = new ArrayList<TaoBaoGoodsBriefExtra>();

                        TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

                        Map<String, String> map = hongBaoManageService.convertMap();

                        String proportion = map.get("hongbao_goods_proportion");

                        String fcRate = map.get("hongbao_fc_ratio");

                        BigDecimal  rate = hongBaoManageService.getFanLiRate();

                        for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,

                                    fcRate, "");

                            taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, rate.toString(), "");

                            tbbeList.add(taoBaoGoodsBriefExtra);

                        }

                        return tbbeList;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;



import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

@@ -197,8 +198,7 @@
                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        Map<String, String> map = manageService.convertMap();

        String proportion = map.get("hongbao_goods_proportion");

        String fcRate = map.get("hongbao_fc_ratio");

        BigDecimal  rate = manageService.getFanLiRate();

        

        

        for (UserGoodsStorage userGoodsStorage : listStorage) {

@@ -259,7 +259,7 @@
            if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {

                commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));

            }

            String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate, null));

            String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, rate.toString(), null));



            dataObject.put("storageId", userGoodsStorage.getId());

            dataObject.put("goods", json);


 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoManageService.java

@@ -1,25 +1,54 @@
package com.yeshi.fanli.service.inter.hongbao;



import java.math.BigDecimal;

import java.util.List;

import java.util.Map;



import org.springframework.cache.annotation.CacheEvict;

import org.springframework.cache.annotation.Cacheable;



import com.yeshi.fanli.entity.bus.user.HongBaoManage;



import com.yeshi.fanli.exception.HongBaoManageException;



public interface HongBaoManageService {



    public List<HongBaoManage> getHongBaoManage();

	
    @CacheEvict(value="homeBaoManage",allEntries=true)



    @CacheEvict(value = "homeBaoManage", allEntries = true)

    public void update(List<HongBaoManage> hongBaoManageList);

	


    public String get(String key);

	
	


    public Map<String, String> convertMap();



    /**

     * 获取返利订单返利比例

     * 
     * @param time

     * @return

     */

    public BigDecimal getFanLiRate(long time);



    /**

     * 获取分享订单返利比例

     * 
     * @param time

     * @return

     */

    public BigDecimal getShareRate(long time);

    

	
    /**

     * 获取返利订单返利比例

     * 
     * @return

     */

    public BigDecimal getFanLiRate() ;



    /**

     * 获取分享订单返利比例

     * 
     * @return

     */

    public BigDecimal getShareRate();



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java

@@ -169,7 +169,7 @@
     * @param proportion  计算比例

     * @return

     */

    public JSONArray  getRecommendToIndex(long start, int count, String proportion, String fcRate);

    public JSONArray  getRecommendToIndex(long start, int count, String proportion);

    

    public long countRecommendToIndex(String proportion);

    


 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java

@@ -82,27 +82,5 @@
        hongBao.setHasChild(false);

        return hongBao;

    }

	
    /**

     * 获取红包可打开时间

     * @param timeMillis

     * @param type 红包类型

     * @return

     */

    private static long preGettime(long timeMillis,int type){

        Map<String, String> map = hongBaoFactory.hongBaoManageService.convertMap();

        String day = null;

        String hour = null;

        if(type != Constant.HB_NEWUSER){

            day = map.get("hongbao_goods_unlock_day");

            hour = map.get("hongbao_goods_unlock_hour");

        }else{

            day = map.get("hongbao_new_user_unlock_day");

            hour = map.get("hongbao_new_user_unlock_hour");

        }

        long dayms =(long) (Double.parseDouble(day) * Constant.DAYMS);

        long hourms =(long)(Double.parseDouble(hour) * Constant.HOURMS);

        return timeMillis+dayms+hourms;

    }



}


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

@@ -683,8 +683,7 @@
        return list;

    }



    public static TaoBaoGoodsBriefExtra getTaoBaoGoodsBriefExtra(TaoBaoGoodsBrief tb, String proportion,

            String fcRateStr, String pid) {

    public static TaoBaoGoodsBriefExtra getTaoBaoGoodsBriefExtra(TaoBaoGoodsBrief tb, String proportion, String pid) {

        TaoBaoGoodsBriefExtra tg = new TaoBaoGoodsBriefExtra();

        tg.setId(tb.getId());

        tg.setAuctionId(tb.getAuctionId());

@@ -715,17 +714,6 @@
            tg.setTaoBaoQuanInfo(quanInfo);

        }

        TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();

        BigDecimal fcRate = BigDecimal.valueOf(1);

        String eventRate = tb.getEventRate();

        BigDecimal rate = BigDecimal.valueOf(0);

        if (eventRate == null) {

            rate = tb.getTkRate();

        } else {

            rate = new BigDecimal(eventRate);

            if (fcRateStr != null) {

                fcRate = (new BigDecimal(fcRateStr).divide(BigDecimal.valueOf(100)));

            }

        }



        hongBaoInfo.setRate("最高40%");



@@ -965,19 +953,8 @@
            tg.setTaoBaoQuanInfo(quanInfo);

        }



        Map<String, String> convertMap = taoBaoUtil.manageService.convertMap();

        String proportion = convertMap.get("hongbao_goods_proportion");

        String fcRateStr = convertMap.get("hongbao_fc_ratio");

        BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate();

        TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();

        String eventRate = tb.getEventRate();

        BigDecimal rate = BigDecimal.valueOf(0);

        if (eventRate != null) {

            rate = new BigDecimal(eventRate);

        } else {

            rate = tb.getTkRate();

        }

        BigDecimal fcRate = new BigDecimal(fcRateStr);



        String tkMktStatus = tb.getTkMktStatus();

        if ("1".equals(tkMktStatus)) {

            hongBaoInfo.setType(1);

@@ -985,7 +962,7 @@


        hongBaoInfo.setRate("最高40%");



        String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion));

        String hongbao = getGoodsHongBaoInfo(tb, proportion);

        if (!hongbao.contains("最高"))

            hongBaoInfo.setHongbao(new BigDecimal(hongbao.replace("¥", "")));

        else

@@ -1401,7 +1378,6 @@
                BigDecimal finalPrice = goodsBrief.getZkPrice().subtract(couponAccount);

                return finalPrice.multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)

                        .setScale(2, BigDecimal.ROUND_DOWN);



            } else {// 不能用券

                return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))

                        .multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);