新版订单统计，返利，到账修改

admin

2019-01-05 374fa38b5e4c17c079e027e9987e966f30a5cd36

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

@@ -24,6 +24,7 @@
import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.taobao.TbImgUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import com.google.gson.Gson;

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

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

@@ -53,12 +55,16 @@
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.money.UserMoneyDetail;

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

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;

@@ -67,12 +73,13 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -83,6 +90,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountService;

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

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

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

@@ -95,7 +103,11 @@
import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.account.UserUtil;

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

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

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

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

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;

@@ -148,9 +160,6 @@
   private OrderItemServcie orderItemServcie;



   @Resource

   private AccountDetailsService accountDetailsService;



   @Resource

   private AccountMessageService accountMessageService;



   @Resource

@@ -176,6 +185,15 @@


   @Resource

   private AdminUserService adminUserService;



   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   @Resource

   private HongBaoOrderService hongBaoOrderService;



   @Resource

   private HongBaoV2Service hongBaoV2Service;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -699,16 +717,9 @@
      JSONObject data = new JSONObject();

      data.put("user", user);

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

      String maxError = "5";

      maxError = configService.get(PASSWORD_MAX_ERROR); // 当日输错密码最多次数

      PassWordErrorRecord record = passWordErrorRecordService.getRecord(uid);

      int max = Integer.parseInt(maxError);

      if (record.getCount() >= max) {

         data.put("error", "1"); // 达到最多限制

      } else {

         data.put("error", "0");

      }

      data.put("maxError", maxError);



      data.put("error", "0");

      data.put("maxError", 1);

      String minMoney = configService.get(EXTRACT_MIN_MONEY); // 单笔提现的最小金额

      String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现的最大金额

      int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));

@@ -1367,15 +1378,20 @@


   @RequestMapping("findOrderItemList")

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

      List<OrderItem> list = orderItemServcie.findOrderItemList(uid, page);

      list.parallelStream().forEach(oi -> {

         oi.setDesc();

      });

      int count = orderItemServcie.getCount(uid);

      List<HongBaoOrder> list = hongBaoOrderService.listFanLiOrder(uid, page, Constant.PAGE_SIZE);



      List<OrderItem> orderList = new ArrayList<>();

      for (HongBaoOrder oi : list) {

         OrderItem orderItem = OrderItemFactory.create(oi);

         orderItem.setDesc();

         orderItem.setPicture(TbImgUtil.getTBSize220Img(orderItem.getPicture()));

         orderList.add(orderItem);

      }

      long count = hongBaoOrderService.countFanLiOrder(uid);

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().create();

      JSONObject data = new JSONObject();

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

      data.put("list", gson.toJson(orderList));

      data.put("count", count);

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

   }

@@ -1390,8 +1406,13 @@
    */

   @RequestMapping("getTiChengOrderList")

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

      List<HongBao> list = hongBaoService.getTiChengHongBaoList(uid, page);

      long count = hongBaoService.getTiChengHongBaoListCount(uid);

      List<HongBaoDTO> hongBaoDTOList = hongBaoV2Service.listJiangJinByUid(uid, page, Constant.PAGE_SIZE);

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

      if (hongBaoDTOList != null)

         for (HongBaoDTO dto : hongBaoDTOList) {

            list.add(HongBaoFactory.createHongBao(dto));

         }

      long count = hongBaoV2Service.countJiangJinByUid(uid);

      List<OrderItem> orderItemList = HongBaoUtil.convertToTiChengOrder(list);

      Gson gson = JsonUtil.getApiCommonGson();

      JSONObject data = new JSONObject();

@@ -1521,20 +1542,66 @@
      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(collectionGoodsV2.getCreateTime());



            list.add(taoBaoGoodsBriefExtra);

         }



      }



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

         @Override

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

@@ -1596,8 +1663,11 @@


   @RequestMapping("findAccountDetailsList")

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

      List<AccountDetails> list = accountDetailsService.findAccountDetailsList(uid, page);

      int count = accountDetailsService.getCount(uid);

      List<UserMoneyDetail> detailList = userMoneyDetailService.listByUidWithState(uid, page, Constant.PAGE_SIZE);

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

      for (UserMoneyDetail detail : detailList)

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

      long count = userMoneyDetailService.countByUidWithState(uid);

      JSONObject data = new JSONObject();

      data.put("list", GsonUtil.toJsonExpose(list));

      data.put("count", count);

@@ -1605,9 +1675,21 @@
   }



   @RequestMapping("findAccountDetailsListV2")

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

      List<AccountDetails> list = accountDetailsService.findAccountDetailsListWithState(uid, page);

      long count = accountDetailsService.getCountWithState(uid);

   public void findAccountDetailsListNew(AcceptData acceptData, Long uid, int page, PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "UID为空"));

         return;

      }



      List<UserMoneyDetail> detailList = userMoneyDetailService.listByUidWithState(uid, page, Constant.PAGE_SIZE);



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

      for (UserMoneyDetail detail : detailList)

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



      long count = userMoneyDetailService.countByUidWithState(uid);



      JSONObject data = new JSONObject();

      JSONArray array = new JSONArray();

      for (AccountDetails ad : list) {