fanli-server.git

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

			import javax.annotation.Resource;

			import com.yeshi.fanli.entity.SystemEnum;
			import org.apache.commons.beanutils.PropertyUtils;
			import org.springframework.cache.annotation.Cacheable;
			import org.springframework.core.task.TaskExecutor;
			@@ -31,6 +32,7 @@
			import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
			import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
			import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
			import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
			import com.yeshi.fanli.entity.common.JumpDetailV2;
			import com.yeshi.fanli.entity.dynamic.DynamicInfo;
			import com.yeshi.fanli.entity.dynamic.GoodsPicture;
			@@ -38,7 +40,7 @@
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
			import com.yeshi.fanli.entity.taobao.TaoBaoShop;
			import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
			import com.yeshi.goods.facade.entity.taobao.DaTaoKeDetailV2;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.activity.ActivityUserService;
			@@ -105,9 +107,6 @@
			@Resource
			private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;

			@Resource
			private GoodsEvaluateService goodsEvaluateService;

			@Override
			public void insert(DynamicInfo record) {
			dynamicInfoDao.insert(record);
			@@ -305,7 +304,7 @@
			// 商品信息
			List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
			for (TaoBaoGoodsBrief goodsBrief : listGoods) {
			BigDecimal proportion = hongBaoManageService.getFanLiRate();
			BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
			TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
			proportion.toString(), null);
			taoBaoGoodsBriefExtra.setCouponInfo(null);
			@@ -361,7 +360,7 @@
			// 分享奖金
			BigDecimal shareMoney = new BigDecimal(0);

			BigDecimal proportion = hongBaoManageService.getFanLiRate();
			BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
			for (DaTaoKeDetailV2 daTaoKe : listDaTaoKe) {
			if (daTaoKeDetail == null) {
			daTaoKeDetail = daTaoKe;
			@@ -376,7 +375,7 @@
			taoBaoGoodsBriefExtra.setState(1);
			}

			BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
			BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief,SystemEnum.blks);
			shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
			// 商品图片
			taoBaoGoodsBriefExtra.setUpdatetime(new Date());
			@@ -494,7 +493,7 @@
			}

			TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
			BigDecimal proportion = hongBaoManageService.getFanLiRate();
			BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
			TaoBaoGoodsBriefExtra goodsExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),
			null);

			@@ -542,7 +541,7 @@
			goodsExtra.setImgList(imgList);

			// 分享奖金
			BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
			BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief,SystemEnum.blks);
			ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
			shareMoneyDesc.setColor("#FFFFFF");
			shareMoneyDesc.setBottomColor("#E8AE48");
			@@ -812,7 +811,7 @@
			List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
			// 商品列表
			List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
			BigDecimal proportion = hongBaoManageService.getFanLiRate();
			BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
			// 分享奖金
			BigDecimal shareMoney = new BigDecimal(0);

			@@ -831,7 +830,7 @@
			taoBaoGoodsBriefExtra.setState(1);
			}

			BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
			BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief,SystemEnum.blks);
			shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
			} catch (TaobaoGoodsDownException e) {
			taoBaoGoodsBrief = activityGoods.getTaoBaoGoodsBrief();
			@@ -977,9 +976,9 @@
			// 提取商品
			Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterGoodsMap(list);

			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
			BigDecimal shareRate = hongBaoManageService.getShareRate();
			ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(SystemEnum.blks);
			BigDecimal shareRate = hongBaoManageService.getShareRate(SystemEnum.blks);
			ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,SystemEnum.blks));

			for (DynamicInfo dynamicInfo : list) {
			DynamicInfo dynamicNew = new DynamicInfo();
			@@ -1082,7 +1081,7 @@
			}

			try {
			BigDecimal proportion = hongBaoManageService.getFanLiRate();
			BigDecimal proportion = hongBaoManageService.getFanLiRate(SystemEnum.blks);
			for (DynamicInfo dynamicInfo : list) {
			// 邀请数据不做更新
			long classId = dynamicInfo.getClassId();
			@@ -1169,7 +1168,7 @@

			// 更新热销单品的分享奖金
			if (classId == 1) {
			BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
			BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief,SystemEnum.blks);
			ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
			shareMoneyDesc.setColor("#FFFFFF");
			shareMoneyDesc.setBottomColor("#E8AE48");