取消红包参数异常

admin

2018-12-10 5d59c0ad6e82b6255cf38c3dba715395af1d60a7

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

@@ -9,7 +9,6 @@
import java.util.Arrays;

import java.util.Date;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;

@@ -50,6 +49,7 @@
import com.yeshi.fanli.entity.bus.user.UserActiveLog;

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

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

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.system.System;

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

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

@@ -57,7 +57,6 @@
import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

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

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.log.LogHelper;

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

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

@@ -773,7 +772,7 @@
      ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);

      boolean canExtract = true;

      String errorMsg = "";

      if (extractRecord != null && extractRecord.getCount() + 1 >= maxDayCount) {

      if (extractRecord != null && extractRecord.getCount() + 1 > maxDayCount) {

         canExtract = false;

         errorMsg = String.format("每日最多提现%s次", maxDayCount + "");

      } else if (extractRecord != null

@@ -1505,15 +1504,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);

      });