新版订单、红包

喻健

2018-12-25 95654e5a5a1d0c4384cf44a1510c670ec804abc7

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

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

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Controller;

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

@@ -53,12 +56,14 @@
import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

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

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

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

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

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

import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.ObjectStateException;

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

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

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

@@ -96,10 +101,8 @@
import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.email.MailSenderUtil;

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

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

import com.yeshi.fanli.util.wx.WXLoginUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/v1/customer")

@@ -1514,20 +1517,68 @@
      List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page + 1,

            Constant.PAGE_SIZE);



      // List<CollectionGoods> coList =

      // collectionGoodsService.findCollectionGoods(uid, page + 1);

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

		
		
      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

      JSONObject data = new JSONObject();

      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.toString(), "");

         taoBaoGoodsBriefExtra.setCreatetime(cg.getCreateTime());

         list.add(taoBaoGoodsBriefExtra);

      });

	
		
      List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();

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

			
         BigDecimal proportion = hongBaoManageService.getFanLiRate();

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

         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

            if (commonGoods == null) {

               continue;

            }

            listGid.add(commonGoods.getGoodsId());

         }

			
         try {

            // API网络接口验证是否在售

            listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);

         } catch (TaoKeApiException e) {

            e.printStackTrace();

         } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

         } catch (Exception e) {

            e.printStackTrace();

         }

			
         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

            if (commonGoods == null) {

               continue;

            }

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

               int state = 1;  // 默认停售

               Long goodsId = commonGoods.getGoodsId();

               for (TaoBaoGoodsBrief taoKeGoods: listTaoKeGoods) {

                  Long auctionId = taoKeGoods.getAuctionId();

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

                     state = 0; // 在售

                     break;

                  }

               }

               commonGoods.setState(state);

            }

				
            TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

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

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

                  proportion.toString(), "");

            taoBaoGoodsBriefExtra.setCreatetime(commonGoods.getCreateTime());

				
            list.add(taoBaoGoodsBriefExtra);

         }

			
      }

		
      GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

         @Override

         public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {