旧版资金明细删除

admin

2019-03-12 0a21bd61c3c7f33606ea8f571e619e5b1a49c404

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -30,8 +30,8 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.controller.admin.utils.AdminUtils;

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

import com.yeshi.fanli.entity.admin.UserInfoAdmin;

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

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

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

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

@@ -43,6 +43,7 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

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

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

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

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

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

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

@@ -54,7 +55,6 @@
import com.yeshi.fanli.service.inter.order.OrderItemServcie;

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

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

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

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

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

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

@@ -64,6 +64,7 @@
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

@@ -71,6 +72,7 @@
import com.yeshi.fanli.util.HongBaoUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.AccountDetailsFactory;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -112,9 +114,6 @@
   private PidOrderService pidOrderService;



   @Resource

   private AccountDetailsService accountDetailsService;



   @Resource

   private BindingAccountService bindingAccountService;



   @Resource

@@ -134,6 +133,9 @@
   

   @Resource

   private UserRankService userRankService;



   @Resource

   private UserMoneyDetailService userMoneyDetailService;



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

   public void getUserList(int pageIndex, String key, PrintWriter out) {

@@ -723,9 +725,6 @@
         // 累计有购买用户数

         long orderUser = userInfoCountService.countHasOrderUser();

         

		
			
			
         // 总数-普通用户

         long countNormal = 0;

         // 总数-铜用户

@@ -758,7 +757,6 @@
         // 普通用户计算

         countNormal = totalUser - (countCuprum + countSilver + countGold);

         

			
         JSONObject data = new JSONObject();

         data.put("totalUser", totalUser);

         data.put("loseUser", loseUser);

@@ -780,8 +778,6 @@
          * data.put("countTotalMoney", countTotalMoney);

          * data.put("countCanAssets", countCanAssets);

          */



		


         // 今日新增用户数量

         long todayUser = userInfoCountService.countNewUser(1, null);

@@ -1298,20 +1294,25 @@


      try {



         List<AccountDetails> detailsList = accountDetailsService.findAccountDetailsList(uid, pageIndex);

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

         List<UserMoneyDetail> userMoneyDetailsList = userMoneyDetailService.listByUidWithState(uid, pageIndex,

               pageSize);

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

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         int count = accountDetailsService.getCount(uid);

         List<AccountDetails> detailList = new ArrayList<>();

         for (UserMoneyDetail detail : userMoneyDetailsList)

            detailList.add(AccountDetailsFactory.create(detail));



         long count = userMoneyDetailService.countByUidWithState(uid);



         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("result_list", GsonUtil.toJsonExpose(detailsList));

         data.put("result_list", GsonUtil.toJsonExpose(detailList));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));