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

yujian

2019-07-30 dadacf7c1065876248bec86cf17c06ca4be1b97c

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -61,9 +60,6 @@


   @Resource

   private ExtractService extractService;



   @Resource

   private PassWordErrorRecordService passWordErrorRecordService;



   @Resource

   private ConfigService configService;

@@ -326,7 +322,7 @@
    */

   @RequestMapping("collectionGoods")

   public void collectionGoods(long uid, long auctionId, int type, PrintWriter out) {

      CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);

      CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,Constant.SOURCE_TYPE_TAOBAO);

      if (type == 1) {

         if (find != null) {

            out.print(JsonUtil.loadFalseResult(""));

@@ -347,7 +343,7 @@
            return;

         } else {

            try {

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);

               out.print(JsonUtil.loadTrueResult("取消收藏成功"));

            } catch (CollectionGoodsException e) {

               out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

@@ -366,9 +362,9 @@
    * @param out

    */

   @RequestMapping("collectionGoodsList")

   public void collectionGoodsList(long uid, int page, int pageSize, PrintWriter out) {

      List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

   public void collectionGoodsList(long uid, int page, int pageSize, Integer source,PrintWriter out) {

      List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize, source);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, source);

      JSONObject data = new JSONObject();

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

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