邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

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

@@ -5,7 +5,6 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;

@@ -32,7 +31,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

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

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

@@ -42,7 +40,6 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;

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

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

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

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

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

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

@@ -70,8 +67,7 @@
   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private MoneyRecordService moneyRecordService;





   @Resource

   private BindingAccountService bindingAccountService;

@@ -87,9 +83,6 @@


   @Resource

   private XcxMiniControllerUtil xcxMiniControllerUtil;



   @Resource

   private HongBaoMessageService hongBaoMessageService;



   @Resource

   private ShamUserService shamUserService;

@@ -400,14 +393,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);