Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-10 99edd3ce8ee02b358245bff195a9f63677ef61d6

Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

# Conflicts:
#	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
#	fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

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

@@ -50,8 +50,10 @@
     * 分享商品详情

     * 

     * @param callback

     * @param shareId  分享id

     * @param source   来源

     * @param shareId

     *            分享id

     * @param source

     *            来源

     * @param out

     */

    @RequestMapping(value = "getDetail")

@@ -78,8 +80,10 @@
     * 分享商品列表

     * 

     * @param callback

     * @param shareId  分享id

     * @param source   来源

     * @param shareId

     *            分享id

     * @param source

     *            来源

     * @param out

     */

    @RequestMapping(value = "getList")

@@ -97,18 +101,18 @@
                List<Long> listIdTB = new ArrayList<Long>();

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

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

				


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

                    CommonGoods commonGoods = list.get(i).getCommonGoods();

                    if (commonGoods == null) {

                        continue;

                    }

					


                    Integer goodsType = commonGoods.getGoodsType();

                    if (goodsType == null) {

                        continue;

                    }

					


                    if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {

                        listIdTB.add(commonGoods.getGoodsId());

                    } else if (Constant.SOURCE_TYPE_JD == goodsType) {

@@ -117,7 +121,7 @@
                        listIdPDD.add(commonGoods.getGoodsId());

                    }

                }

				


                // 淘宝验证是否在售

                List<TaoBaoGoodsBrief> listTB = null;

                if (listIdTB.size() > 0) {

@@ -127,7 +131,7 @@
                        e.printStackTrace();

                    }

                }

				


                // 京东验证是否在售

                List<JDGoods> listJD = null;

                if (listIdJD.size() > 0) {

@@ -136,7 +140,7 @@
                        filter.setListId(listIdJD);

                        filter.setPageIndex(1);

                        filter.setPageSize(100);

                        JDSearchResult  result = JDApiUtil.queryByKey(filter);

                        JDSearchResult result = JDApiUtil.queryByKey(filter);

                        if (result != null) {

                            listJD = result.getGoodsList();

                        }

@@ -144,8 +148,7 @@
                        e.printStackTrace();

                    }

                }

				
				


                // 拼多多验证是否在售

                List<PDDGoodsDetail> listPDD = null;

                if (listIdPDD.size() > 0) {

@@ -155,7 +158,7 @@
                        sf.setPage(1);

                        sf.setPageSize(100);

                        sf.setGoodsIdList(listIdPDD.toArray(ids));

                        PDDGoodsResult  result = PinDuoDuoApiUtil.searchGoods(sf);

                        PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf);

                        if (result != null) {

                            listPDD = result.getGoodsList();

                        }

@@ -163,13 +166,13 @@
                        e.printStackTrace();

                    }

                }

				
				


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

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

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                        hongBaoManageService.getVIPFanLiRate());

                for (UserShareGoodsGroup goodsGroup : list) {

                    CommonGoods commonGoods = goodsGroup.getCommonGoods();

                    if (commonGoods == null) {

@@ -180,11 +183,11 @@
                        goodsType = Constant.SOURCE_TYPE_TAOBAO;

                    }

                    Long commonGid = commonGoods.getGoodsId();

					


                    if (goodsType == Constant.SOURCE_TYPE_TAOBAO && listTB != null && listTB.size() > 0) {

                        int state = 1; // 默认停售

                        for (TaoBaoGoodsBrief goodsDetail : listTB) {

                            Long goodsId =goodsDetail.getAuctionId();

                            Long goodsId = goodsDetail.getAuctionId();

                            if (goodsId == commonGid || goodsId.equals(commonGid)) {

                                state = 0; // 在售

                                break;

@@ -192,11 +195,11 @@
                        }

                        commonGoods.setState(state);

                    }

					


                    if (goodsType == Constant.SOURCE_TYPE_JD && listJD != null && listJD.size() > 0) {

                        int state = 1; // 默认停售

                        for (JDGoods goodsDetail : listJD) {

                            Long goodsId =goodsDetail.getSkuId();

                            Long goodsId = goodsDetail.getSkuId();

                            if (goodsId == commonGid || goodsId.equals(commonGid)) {

                                state = 0; // 在售

                                break;

@@ -204,12 +207,11 @@
                        }

                        commonGoods.setState(state);

                    }

					
					


                    if (goodsType == Constant.SOURCE_TYPE_PDD && listPDD != null && listPDD.size() > 0) {

                        int state = 1; // 默认停售

                        for (PDDGoodsDetail goodsDetail : listPDD) {

                            Long goodsId =goodsDetail.getGoodsId();

                            Long goodsId = goodsDetail.getGoodsId();

                            if (goodsId == commonGid || goodsId.equals(commonGid)) {

                                state = 0; // 在售

                                break;

@@ -219,7 +221,8 @@
                    }

                    GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, configParamsDTO);

                    if (!detailVO.isHasCoupon()) {

                        detailVO.setState(1);; // 已抢光

                        detailVO.setState(1);

                        ; // 已抢光

                    }

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

                }


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java

@@ -89,7 +89,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

        /* 遍历列表数据 */

        for (QualityFactory selectionGoods : listQuery) {




 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5TaoLiJinController.java

@@ -62,8 +62,9 @@
        BigDecimal proportion = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

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

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

		
        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE);



        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE,

                hongBaoManageService.getVIPFanLiRate());

        for (TLJBuyGoods goods : goodsList) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = goods.getGoods();

            if (taoBaoGoodsBrief == null) {

@@ -112,8 +113,9 @@
                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

        BigDecimal fanLiRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

        BigDecimal shareRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

		
        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                hongBaoManageService.getVIPFanLiRate());



        for (ShareHotGoods hotGoods : goodsList) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();

            if (taoBaoGoodsBrief == null) {


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

@@ -310,7 +310,7 @@


            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

            // 商品信息过滤

            listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);



@@ -535,7 +535,7 @@


            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

            // 商品信息过滤

            listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);



@@ -719,7 +719,7 @@
        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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

        

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

        JSONArray array = new JSONArray();

        

        List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId((page - 1) * 50, 50,id);


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

@@ -164,7 +164,7 @@
        List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();

        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

        for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {

            GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);

            if (type == CommonContentTypeEnum.mianDan)// 免单商品

@@ -214,7 +214,7 @@
                BigDecimal shareRate = hongBaoManageService.getShareRate();

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

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

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

                for (JDGoods goods : goodsList) {

                    array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO)));

                }

@@ -264,7 +264,7 @@
                BigDecimal shareRate = hongBaoManageService.getShareRate();

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

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

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

                for (PDDGoodsDetail goods : goodsList) {

                    array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO)));

                }


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

@@ -238,7 +238,7 @@


            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

            for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

                CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

                if (commonGoods == null) {

@@ -353,7 +353,7 @@
            Gson gson = gsonBuilder.create();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

            for (ScanHistoryV2 sh : list) {

                CommonGoods commonGoods = sh.getCommonGoods();

                if (commonGoods == null) {


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

@@ -178,7 +178,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

        

        // 精选库数据

        JSONArray array = new JSONArray();

@@ -295,7 +295,7 @@
                if (resultGoodsList != null) {

                    BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                    BigDecimal shareRate = hongBaoManageService.getShareRate();

                    ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                    ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());

                    for (TaoBaoGoodsBrief goods : resultGoodsList) {

                        GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

                        array.add(gson2.toJson(goodsDetailVO));


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

@@ -69,6 +69,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -183,12 +184,15 @@


    @Resource

    private JDGoodsClassService jdGoodsClassService;

	


    @Resource

    private TLJFreeBuyGoodsService tljFreeBuyGoodsService;

	


    @Resource

    private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;



    @Resource

    private UserVIPInfoService userVIPInfoService;



    /**

     * 淘宝商品详情

@@ -352,8 +356,13 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                hongBaoManageService.getVIPFanLiRate());

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

        if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

            goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

            goodsDetail.getMoneyInfo().setShareMoney("¥"+ TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPShareRate()));

        }



        if (TaoBaoUtil.isYUShou(goods)) {

            if (!StringUtil.isNullOrEmpty(goods.getPresaleDiscountFeeText())) {

@@ -433,7 +442,7 @@
        } catch (Exception e) {

            extraVO.setH5Url(h5Url);

        }

		


        String helpLink = null;

        boolean fanliValid = true;

        boolean shareValid = true;

@@ -475,7 +484,8 @@
                    goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));

            }

        } else if (from != null && from.equals("taolijin_free_buy")) {

            TLJFreeBuyGoods freeGoods = tljFreeBuyGoodsService.selectByAuctionIdAndDay(id, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));

            TLJFreeBuyGoods freeGoods = tljFreeBuyGoodsService.selectByAuctionIdAndDay(id,

                    TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));

            if (freeGoods == null) {

                out.print(JsonUtil.loadFalseResult(2, "免单商品已下架"));

                return;

@@ -484,9 +494,9 @@
            fanliValid = true;

            shareValid = false;

            BigDecimal couponPrice = goodsDetail.getCouponPrice();

            if (couponPrice == null) 
            if (couponPrice == null)

                couponPrice = goodsDetail.getZkPrice();

			


            NewUserHongBao newUserHongBao = new NewUserHongBao();

            newUserHongBao.setMoney(couponPrice.setScale(2).toString());

            newUserHongBao.setName("新人红包 ");

@@ -511,8 +521,8 @@
            JSONObject params1 = new JSONObject();

            params1.put("url", configService.get("special_guide_reward_coupon_link"));



            rewardCoupon.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate).add(MoneyBigDecimalUtil

                    .mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate), Constant.MAX_REWARD_RATE)));

            rewardCoupon

                    .setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, hongBaoManageService.getVIPFanLiRate()));

            if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

                rewardCoupon.setDesc("返");

                params1.put("url", configService.get("vip_link"));

@@ -600,8 +610,13 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                hongBaoManageService.getVIPFanLiRate());

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);

        if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

            goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

            goodsDetail.getMoneyInfo().setShareMoney("¥"+ JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPShareRate()));

        }



        // 附加信息

        OtherInfo otherInfo = new OtherInfo();

@@ -641,8 +656,7 @@
        JSONObject params1 = new JSONObject();

        params1.put("url", configService.get("special_guide_reward_coupon_link"));



        rewardCoupon.setMaxMoney("¥" + JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate)

                .add(MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE)));

        rewardCoupon.setMaxMoney("¥" + JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getVIPFanLiRate()));

        if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            rewardCoupon.setDesc("返");

            params1.put("url", configService.get("vip_link"));

@@ -788,8 +802,13 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                hongBaoManageService.getVIPFanLiRate());

        GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);

        if (goodsDetail != null && goodsDetail.getMoneyInfo() != null && userVIPInfoService.isVIP(uid)) {

            goodsDetail.getMoneyInfo().setFanliMoney(goodsDetail.getMoneyInfo().getMaxMoney());

            goodsDetail.getMoneyInfo().setShareMoney("¥"+ PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPShareRate()));

        }



        // 附加信息

        OtherInfo otherInfo = new OtherInfo();

@@ -798,8 +817,8 @@
        JSONObject params1 = new JSONObject();

        params1.put("url", configService.get("special_guide_reward_coupon_link"));



        rewardCoupon.setMaxMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate).add(MoneyBigDecimalUtil

                .mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate), Constant.MAX_REWARD_RATE)));

        rewardCoupon

                .setMaxMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, hongBaoManageService.getVIPFanLiRate()));

        if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            rewardCoupon.setDesc("返");

            params1.put("url", configService.get("vip_link"));

@@ -953,7 +972,8 @@


                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                        hongBaoManageService.getVIPFanLiRate());

                List<GoodsDetailVO> listDetailVO = new ArrayList<GoodsDetailVO>();



                for (JDGoods goods : list) {

@@ -997,7 +1017,7 @@
                            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                            BigDecimal shareRate = hongBaoManageService.getShareRate();

                            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate,

                                    Constant.MAX_REWARD_RATE);

                                    Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate());

                            for (PDDGoodsDetail goods : goodsList) {

                                listDetailVO.add(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO));

                            }

@@ -1042,7 +1062,8 @@


                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                        hongBaoManageService.getVIPFanLiRate());



                goodsList.parallelStream().forEach(goods -> {

                    if (goods != null) {

@@ -1319,7 +1340,7 @@
        Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();



        ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),

                hongBaoManageService.getShareRate(), new BigDecimal(80));

                hongBaoManageService.getShareRate(), new BigDecimal(80), hongBaoManageService.getVIPFanLiRate());



        if (tbGoodsList.size() > 0) {

            List<TaoBaoGoodsBrief> goodsList = null;


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

@@ -98,7 +98,7 @@
            if (detailList != null) {

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());



                for (DaTaoKeDetailV2 detail : detailList) {

                    TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);


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

@@ -118,7 +118,7 @@
            if (goodsList != null && goodsList.size() > 0) {

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());



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

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


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

@@ -111,7 +111,7 @@
                Gson gson = JsonUtil.getApiCommonGson();

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,    hongBaoManageService.getVIPFanLiRate());



                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);


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

@@ -282,7 +282,7 @@
                    continue;

                }

                GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE));

                        new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()));



                JSONObject params = new JSONObject();

                params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());

@@ -409,7 +409,7 @@
        if (detailList != null) {

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (DaTaoKeDetailV2 detail : detailList) {

                array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(detail), paramsDTO)));

@@ -555,7 +555,7 @@


            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (TaoBaoGoodsBrief goods : goodsList) {

                GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

@@ -573,7 +573,7 @@
                List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());

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

                    BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

                    ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE);

                    ConfigParamsDTO paramsBuy = new ConfigParamsDTO(rateBuy, rateBuy, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

                    for (int i = list.size() - 1; i >= 0; i--) {

                        TLJBuyGoods goods = list.get(i);

                        GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), paramsBuy);

@@ -631,7 +631,7 @@
                    if (gList != null) {

                        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                        BigDecimal shareRate = hongBaoManageService.getShareRate();

                        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

                        for (TaoBaoGoodsBrief goods : gList) {

                            if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                                    && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

@@ -704,7 +704,7 @@
            if (goodsList != null && goodsList.size() > 0) {

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



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

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

@@ -738,7 +738,7 @@
            if (goodsList != null && goodsList.size() > 0) {

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);

@@ -773,7 +773,7 @@
                count = arrayKeys.size();

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



                int j = 1;

                for (int i = (page - 1) * 3; i < arrayKeys.size(); i++) {


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

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

            data.put("type", type);

            data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

                    new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));

                    new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

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

            return;

        }

@@ -475,7 +475,7 @@
                        JSONObject data = new JSONObject();

                        data.put("type", 3);

                        data.put("goods", gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief,

                                new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE))));

                                new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate()))));

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

                        return true;

                    }

@@ -747,7 +747,7 @@
        List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



        for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {

            list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));

@@ -941,7 +941,7 @@
                BigDecimal shareRate = hongBaoManageService.getShareRate();

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

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

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



                for (JDGoods goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);

@@ -1025,7 +1025,7 @@
            if (goodsList != null && goodsList.size() > 0) {

                BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

                BigDecimal shareRate = hongBaoManageService.getShareRate();

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

                ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



                for (PDDGoodsDetail goods : goodsList) {

                    GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);


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

@@ -285,7 +285,7 @@


            if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {

                ConfigParamsDTO dto = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),

                        hongBaoManageService.getShareRate(), new BigDecimal(80));

                        hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

                GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);

                shareInfo.setGoodsInfo(goodsInfo);

            }

@@ -652,7 +652,7 @@


        if (needGoods)

            shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods, new ConfigParamsDTO(

                    hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), new BigDecimal(80))));

                    hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate())));



        String shareText = "";

        boolean hasCoupon = false;

@@ -768,7 +768,7 @@
        shareInfo.setPictUrl(goods.getGoodsImageUrl());

        if (needGoods) {

            shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertPDDGoods(goods, new ConfigParamsDTO(

                    hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(), new BigDecimal(80))));

                    hongBaoManageService.getFanLiRate(), hongBaoManageService.getShareRate(),  Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate())));

        }



        String template = "";

@@ -1419,7 +1419,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



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

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


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

@@ -207,7 +207,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



        for (UserGoodsStorage userGoodsStorage : listStorage) {

            CommonGoods commonGoods = userGoodsStorage.getCommonGoods();


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

@@ -490,7 +490,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

        BigDecimal shareRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



        for (ShareHotGoods hotGoods : listHot) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();

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



        BigDecimal proportion = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

        for (TLJBuyGoods hotGoods : listHot) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();

            if (taoBaoGoodsBrief == null) {

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



        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, fanLiRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, fanLiRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

        for (TLJFreeBuyGoods freeGoods : listFree) {

            TaoBaoGoodsBrief goods = freeGoods.getGoods();

            if (goods == null)


 fanli/src/main/java/com/yeshi/fanli/dto/ConfigParamsDTO.java

@@ -8,14 +8,27 @@
    // 分享比例

    private BigDecimal shareRate;

    // 奖励券最高返比例

    private BigDecimal maxRewardRate;

//    private BigDecimal maxRewardRate;

    // VIP返利比例

    private BigDecimal vipFanLiRate;// 会员返利比例



    public ConfigParamsDTO() {}

    public BigDecimal getVipFanLiRate() {

        return vipFanLiRate;

    }



    public ConfigParamsDTO(BigDecimal fanLiRate, BigDecimal shareRate, BigDecimal maxRewardRate) {

    public void setVipFanLiRate(BigDecimal vipFanLiRate) {

        this.vipFanLiRate = vipFanLiRate;

    }



    public ConfigParamsDTO() {



    }



    public ConfigParamsDTO(BigDecimal fanLiRate, BigDecimal shareRate, BigDecimal maxRewardRate, BigDecimal vipRate) {

        this.fanLiRate = fanLiRate;

        this.shareRate = shareRate;

        this.maxRewardRate = maxRewardRate;

//        this.maxRewardRate = maxRewardRate;

        this.vipFanLiRate = vipRate;

    }



    public BigDecimal getFanLiRate() {

@@ -34,12 +47,12 @@
        this.shareRate = shareRate;

    }



    public BigDecimal getMaxRewardRate() {

        return maxRewardRate;

    }



    public void setMaxRewardRate(BigDecimal maxRewardRate) {

        this.maxRewardRate = maxRewardRate;

    }

//    public BigDecimal getMaxRewardRate() {

//        return maxRewardRate;

//    }

//

//    public void setMaxRewardRate(BigDecimal maxRewardRate) {

//        this.maxRewardRate = maxRewardRate;

//    }



}


 fanli/src/main/java/com/yeshi/fanli/dto/mq/user/UserTopicTagEnum.java

@@ -16,9 +16,10 @@
    systemCouponDrawback(UserSystemCouponUseMQMsg.class),//系统券退回

    inviteSuccess(UserInviteMQMsg.class), // 邀请成功

    integralTaskFinish(IntegralTaskMQMsg.class), // 完成金币任务

    userRegister(UserRegisterMQMsg.class),

    tokenOutOfDate(InterTokenMQMsg.class),

    redPackGiftDrawback(UserRedPackGiftMQMsg.class);// 红包赠送退回

    userRegister(UserRegisterMQMsg.class),//注册

    tokenOutOfDate(InterTokenMQMsg.class),//口令过期

    redPackGiftDrawback(UserRedPackGiftMQMsg.class),// 红包赠送退回

    userInfoUpdate(null); //用户信息修改



    private final Class<?> clazz;




 fanli/src/main/java/com/yeshi/fanli/dto/mq/user/body/UserInfoUpdateMQMsg.java

New file
@@ -0,0 +1,65 @@
package com.yeshi.fanli.dto.mq.user.body;



import java.util.Date;



import com.yeshi.fanli.dto.mq.BaseMQMsgBody;



/**

 * 用户信息修改

 * 
 * @author Administrator

 *

 */

public class UserInfoUpdateMQMsg extends BaseMQMsgBody {



    public enum UserInfoUpdateTypeEnum {

        nickName("昵称"), portrait("头像"), sex("绑定更换"), inviteCode("邀请码修改"), wxId("微信号"), wxErCode("微信二维码");

        private final String desc;



        private UserInfoUpdateTypeEnum(String desc) {

            this.desc = desc;

        }



        public String getDesc() {

            return desc;

        }

    }



    private Long uid;// 用户ID

    private UserInfoUpdateTypeEnum type;// 类型

    private String value;// 值

    private Date createTime;//时间



    public Long getUid() {

        return uid;

    }



    public void setUid(Long uid) {

        this.uid = uid;

    }



    public UserInfoUpdateTypeEnum getType() {

        return type;

    }



    public void setType(UserInfoUpdateTypeEnum type) {

        this.type = type;

    }



    public String getValue() {

        return value;

    }



    public void setValue(String value) {

        this.value = value;

    }



    public Date getCreateTime() {

        return createTime;

    }



    public void setCreateTime(Date createTime) {

        this.createTime = createTime;

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java

@@ -433,7 +433,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



        // 淘宝商品信息过滤

        Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);

@@ -540,7 +540,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

        // 淘宝商品信息过滤

        Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);




 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java

@@ -426,7 +426,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

        List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();

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

            BrandInfoVO brand = list.get(i);


 fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java

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



import java.util.ArrayList;

import java.util.Date;

import java.util.List;



@@ -248,8 +249,16 @@
        String hotWords = DaTaoKeApiUtil.getHotWords();

        if (StringUtil.isNullOrEmpty(hotWords))

            return;



        config.setValue(hotWords);

        JSONArray array = JSONArray.fromObject(hotWords);

        String reg = "^([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9_-]){1,20}$";

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

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

            String key = array.optString(i);

            if (key.matches(reg)) {

                list.add(key);

            }

        }

        config.setValue(new Gson().toJson(list));

        config.setCreatetime(currentTime + "");

        configMapper.updateByPrimaryKeySelective(config);

    }


 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -967,7 +967,7 @@


            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



            for (DynamicInfo dynamicInfo : list) {

                DynamicInfo dynamicNew = new DynamicInfo();


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

@@ -379,7 +379,7 @@
        }



        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



        for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief,paramsDTO);


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

@@ -299,7 +299,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



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

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


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

@@ -26,6 +26,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -67,7 +68,7 @@
    @Transactional

    private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {

        // TODO 确定生效日期 机制2020年生效

        if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")) {

        if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")&&!Constant.IS_TEST) {

            return;

        }




 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java

@@ -213,7 +213,7 @@


        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

        BigDecimal shareRate = hongBaoManageService.getShareRate();

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

        ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



        for (TaoBaoShopVO taoBaoShopVO : list) {

            


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

@@ -177,15 +177,12 @@


    @Resource

    private UserSystemCouponActivateService userSystemCouponActivateService;

	


    @Resource(name = "producer")

    private Producer producer;

    

    @Lazy

    @Resource

    private UserVIPInfoService userVIPInfoService;



	


    @Override

    public int insertSelective(UserSystemCoupon record) {

@@ -302,8 +299,8 @@
        userCoupon.setCreateTime(new Date());

        userCoupon.setUpdateTime(new Date());

        userSystemCouponMapper.insertSelective(userCoupon);

		
        if(coupon.getType() == CouponTypeEnum.freeCoupon) {



        if (coupon.getType() == CouponTypeEnum.freeCoupon) {

            userSystemCouponActivateService.addActivateRecord(userCoupon.getId());

        }



@@ -856,6 +853,22 @@
        if (orderNo == null || orderNo.trim().length() == 0)

            throw new UserSystemCouponException(1, "订单号不存在");



        // 检查订单号是否维权

        List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderNo);

        boolean weiquan = false;

        if (commonOrderList != null) {

            for (CommonOrder commonOrder : commonOrderList) {

                if (commonOrder.getState() == CommonOrder.STATE_WQ) {

                    weiquan = true;

                    break;

                }

            }

        }

		
        if (weiquan) {

            throw new UserSystemCouponException(1, "亲，很遗憾，售后维权订单不能使用返利奖励券~");

        }



        // 订单

        CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,

                sourceType);

@@ -918,8 +931,7 @@
            UserSystemCouponUseMQMsg mqMsg = new UserSystemCouponUseMQMsg(userSystemCoupon.getId(), order.getOrderId(),

                    sourceType, systemCoupon.getType().name());

            // 事务消息

            Message msg =MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon,

                    mqMsg);

            Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon, mqMsg);

            try {

                SendResult result = orderTransactionProducer.send(msg, new LocalTransactionExecuter() {

                    @Override

@@ -1905,7 +1917,7 @@
                        userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);

                    } else {// 可使用 可赠送

                        userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);

						 


                        jumpLink.put("state", "2"); // 已收货

                        jumpLink.put("showNav", false); // 不显示上方统计信息

                        jumpLink.put("type", "1"); // 返利订单

@@ -2105,18 +2117,17 @@
        tips = tips.replace("{口令}", token).replace("{下载链接}", configService.get("app_down_link"));



        UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);

		


        UserSystemCouponUseMQMsg msg = new UserSystemCouponUseMQMsg();

        msg.setUserSystemCouponId(id);

        msg.setCouponType(type.name());

        Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback,

                msg);

        Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg);

        try {

            producer.send(message);

        } catch (Exception e) {

            throw new UserSystemCouponException(1, "创建赠送信息失败");

        }

		


        return couponVO;

    }



@@ -2302,38 +2313,36 @@
        sendBackGiveCoupon(list);

    }



	
    @Override

    @RequestSerializableByKeyService(key = "#id")

    @Transactional(rollbackFor = Exception.class)

    public void sendBackByGiveId(Long couponId) {

        if (couponId == null)

            return;

		


        UserSystemCoupon userCoupon = userSystemCouponMapper.selectByPrimaryKey(couponId);

        if (userCoupon == null)

            return;

		


        Integer state = userCoupon.getState();

        if (state != UserSystemCoupon.STATE_IN_USE)

            return;

		


        UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByCouponId(couponId);

        if (giveRecord == null)

            return;

		
        if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT) 


        if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT)

            return;

		


        // 更新赠送记录

        UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();

        updateRecord.setId(giveRecord.getId());

        updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);

        userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);

		


        // 口令失效

        tokenRecordService.invalidByCoupon(giveRecord.getId());





        Date now = new Date();

        Date endTime = userCoupon.getEndTime();

@@ -2388,14 +2397,13 @@
        msgOther.setReturnTime(sd.format(new Date()));

        userOtherMsgNotificationService.tokenGiveMsg(giveRecord.getGiveUid(), beiZhu, msgOther);

    }

	
	


    @Override

    public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {

        for (UserSystemCouponGiveRecord record : overdueList) {

            if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT) 
            if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)

                continue;

			


            // 更新赠送记录

            UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();

            updateRecord.setId(record.getId());

@@ -2566,9 +2574,9 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

    public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source) {

        if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo)) 
        if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))

            return;

		


        UserSystemCoupon coupon = userSystemCouponMapper.getNeedActivateCouponByType(uid,

                CouponTypeEnum.freeCoupon.name());

        if (coupon == null)

@@ -2578,14 +2586,14 @@
        UserSystemCouponActivate couponActivate = userSystemCouponActivateService.selectForUpdate(id);

        if (couponActivate == null)

            return;

		


        // 验证同订单是否存在

        String key = orderNo + "_" + source;

        String ordernos = couponActivate.getOrdernos();

        if (!StringUtil.isNullOrEmpty(ordernos)) {

            String[] array = ordernos.split(",");

            if (array != null)

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

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

                    if (array[i].equals(key))

                        return;

                }

@@ -2608,7 +2616,7 @@
        } else {

            ordernos = ordernos + "," + key;

        }

		


        UserSystemCouponActivate updateActivate = new UserSystemCouponActivate();

        updateActivate.setId(id);

        updateActivate.setState(state);


 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java

@@ -163,7 +163,7 @@


        BigDecimal commission = CommonGoodsUtil.getCommission(goods, params.getFanLiRate());

        moneyInfoVO.setFanliMoney("¥" + commission);

        moneyInfoVO.setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

        moneyInfoVO.setMaxMoney("¥" + CommonGoodsUtil.getCommission(goods, params.getVipFanLiRate()));

        moneyInfoVO.setShareMoney(CommonGoodsUtil.getCommissionInfo(goods, params.getShareRate()));

        goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -261,13 +261,11 @@
            TaoBaoHongBaoInfo taoBaoHongBaoInfo = goods.getTaoBaoHongBaoInfo();

            moneyInfoVO.setFanliMoney("¥" + taoBaoHongBaoInfo.getHongbao());

            moneyInfoVO.setShareMoney("¥" + taoBaoHongBaoInfo.getHongbao());

            moneyInfoVO.setMaxMoney("¥" + taoBaoHongBaoInfo.getHongbao()

                    .add(MoneyBigDecimalUtil.mul(taoBaoHongBaoInfo.getHongbao(), params.getMaxRewardRate())));

            moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

        } else {

            BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());

            moneyInfoVO.setFanliMoney("¥" + commission);

            moneyInfoVO

                    .setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

            moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

            moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));

        }

        goodsInfo.setMoneyInfo(moneyInfoVO);

@@ -391,7 +389,7 @@
        moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6

        BigDecimal commission = TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getFanLiRate());

        moneyInfoVO.setFanliMoney("¥" + commission);

        moneyInfoVO.setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

        moneyInfoVO.setMaxMoney("¥" + TaoBaoUtil.getGoodsHongBaoMoney(goods, params.getVipFanLiRate()));

        moneyInfoVO.setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods, params.getShareRate()));

        goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -554,7 +552,7 @@
        moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6

        BigDecimal commission = JDUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

        moneyInfoVO.setFanliMoney("¥" + commission);

        moneyInfoVO.setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

        moneyInfoVO.setMaxMoney("¥" + JDUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate()));

        moneyInfoVO.setShareMoney("¥" + JDUtil.getGoodsFanLiMoney(goods, params.getShareRate()));

        goodsInfo.setMoneyInfo(moneyInfoVO);



@@ -695,7 +693,7 @@
        moneyInfoVO.setMoneyType(1); // 默认显示：返 ¥6.6

        BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());

        moneyInfoVO.setFanliMoney("¥" + commission);

        moneyInfoVO.setMaxMoney("¥" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));

        moneyInfoVO.setMaxMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getVipFanLiRate()));

        moneyInfoVO.setShareMoney("¥" + PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getShareRate()));

        goodsInfo.setMoneyInfo(moneyInfoVO);




 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java

@@ -13,7 +13,6 @@
import com.aliyun.openservices.ons.api.Producer;

import com.aliyun.openservices.ons.api.SendResult;

import com.google.gson.Gson;

import com.yeshi.fanli.dto.mq.BaseMQMsgBody;

import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;

import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;

import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;


 fanli/src/main/resource/env-dev/rocketmq.properties

@@ -2,6 +2,6 @@
rocketmq.SecretKey=ixWg90QbYFKP6ae5xpAo2P1qwIyll5
#测试  http://MQ_INST_1205444665315884_Bbkj89nI.mq-internet-access.mq-internet.aliyuncs.com:80
#正式 http://MQ_INST_1205444665315884_BbaMbxF4.mq-internet-access.mq-internet.aliyuncs.com:80
rocketmq.NAMESRV_ADDR=http://MQ_INST_1205444665315884_BbaMbxF4.mq-internet-access.mq-internet.aliyuncs.com:80
rocketmq.NAMESRV_ADDR=http://MQ_INST_1205444665315884_Bbkj89nI.mq-internet-access.mq-internet.aliyuncs.com:80