动态v2兼容

yujian

2019-07-31 f4548a3ee46afe45da4ee2a42dc169c575deee9f

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

@@ -22,7 +22,7 @@
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.system.BusinessSystem;

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

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

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

@@ -35,12 +35,9 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

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

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.PassWordErrorRecordService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -61,16 +58,8 @@
   @Resource

   private OrderService orderService;







   @Resource

   private BindingAccountService bindingAccountService;



   @Resource

   private ExtractService extractService;



   @Resource

   private PassWordErrorRecordService passWordErrorRecordService;



   @Resource

   private ConfigService configService;

@@ -94,9 +83,6 @@
   private CollectionGoodsV2Service collectionGoodsV2Service;

   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private WxDownService wxDownService;



   @Resource

   private RedisManager redisManager;

@@ -126,7 +112,7 @@
         }

      }

      // 不是用ID的登陆的事就多了

      System system = xcxMiniControllerUtil.getSystem(acceptData);

      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

         return;

@@ -320,7 +306,6 @@
            uuser.setLastLoginIp(remotIP);

            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

            userInfoService.updateLoginInfo(uuser);

            wxDownService.save(device);

         }

      });

   }

@@ -337,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(""));

@@ -358,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()));

@@ -377,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>();

@@ -436,22 +421,6 @@
         e.printStackTrace();

      }

      out.print(JsonUtil.loadTrueResult("删除成功"));

   }



   /**

    * 
    * 方法说明: 微信登陆

    * 
    * @author mawurui createTime 2018年4月25日 下午5:02:02

    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "isWxDown")

   public void isWxDown(AcceptData acceptData, PrintWriter out) {

      boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());

      JSONObject data = new JSONObject();

      data.put("isFirst", b);

      out.print(JsonUtil.loadTrueResult(data));

   }



   /**