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

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;

@@ -55,6 +57,7 @@
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;

@@ -70,8 +73,10 @@
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;

@@ -99,6 +104,8 @@
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;

@@ -152,7 +159,6 @@
   @Resource

   private OrderItemServcie orderItemServcie;





   @Resource

   private AccountMessageService accountMessageService;



@@ -182,6 +188,12 @@


   @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";

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

   }

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