Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

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

@@ -34,6 +34,7 @@
import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.dto.money.AccountDetails;

import com.yeshi.fanli.entity.AppVersionInfo;

@@ -42,10 +43,7 @@
import com.yeshi.fanli.entity.bus.user.BindingAccount;

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

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

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

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

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

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

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

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

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

@@ -61,7 +59,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.HongBaoOrder;

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

@@ -73,8 +71,8 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

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

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

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

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

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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

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

@@ -88,7 +86,6 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;

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

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

@@ -134,9 +131,6 @@
   private OrderService orderService;



   @Resource

   private MoneyRecordService moneyRecordService;



   @Resource

   private BindingAccountService bindingAccountService;



   @Resource

@@ -149,7 +143,7 @@
   private ConfigService configService;



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private ShamUserService shamUserService;

@@ -273,7 +267,7 @@
         }

      }

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

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -459,7 +453,7 @@
         }

      }

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

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -713,42 +707,6 @@
      }

      userInfoService.unBindUserInfo(find, type);

      out.print(JsonUtil.loadTrueResult("解绑成功"));

   }



   /**

    * 获取提现记录

    * 
    * @param acceptData

    * @param uid

    *            用户id

    * @param page

    *            页数（从0开始）

    * @param out

    */

   @RequestMapping(value = "getmoneyrecord", method = RequestMethod.POST)

   public void getMoneyRecord(AcceptData acceptData, long uid, int page, PrintWriter out) {

      UserInfo user = userInfoService.getUserById(uid);

      if (user == null) {

         out.print(JsonUtil.loadFalseResult("用户不存在"));

         return;

      }

      if (page < 0) {

         page = 0;

      }



      List<MoneyRecord> moneyRecordList = moneyRecordService.getMoneyRecord(uid, page);

      int count = moneyRecordService.getCount(uid);

      JSONObject data = new JSONObject();

      if (moneyRecordList == null || moneyRecordList.size() == 0) {

         data.put("count", 0);

         data.put("moneyRecordList", new ArrayList());

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

         return;

      }

      data.put("count", count);

      Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

      data.put("moneyRecordList", gson.toJson(moneyRecordList));

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

   }



   /**

@@ -1150,7 +1108,7 @@
         out.print(JsonUtil.loadFalseResult("用户不存在"));

         return;

      }

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         LogHelper.userInfo("提现时，不存在该系统");

         out.print(JsonUtil.loadFalseResult("系统不存在"));

@@ -1266,7 +1224,7 @@
         return;

      }



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         LogHelper.userInfo("提现时，不存在该系统");

         out.print(JsonUtil.loadFalseResult("系统不存在"));