粉丝信息同步调整

yujian

2020-05-26 21c1c197ec0dba6da332bf4119c262267dcfb191

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -5,13 +5,10 @@
import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Map.Entry;



import javax.annotation.Resource;



@@ -36,14 +33,11 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;

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

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

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

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

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

import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrder;

import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrderUserMap;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

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

@@ -288,17 +282,22 @@
      }



      try {

         boolean notBackSuVip =  false;

         if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

            notBackSuVip = true;

         }

			
         // 筛选结果顶部统计

         String validMoney = "0.00";

         String invalidMoney = "0.00";

         if (page == 1) {

            BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,

                  orderNo, state, startTime, endTime, listSource);

                  orderNo, state, startTime, endTime, listSource, notBackSuVip);

            if (predictMoney != null)

               validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();



            BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,

                  orderNo, state, startTime, endTime, listSource);

                  orderNo, state, startTime, endTime, listSource, notBackSuVip);

            if (postSaleMoney != null)

               invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();



@@ -316,9 +315,10 @@
         List<CommonOrderVO> list = null;

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            list = commonOrderService.getOrderList(acceptData, page, uid, state, orderType,

                  orderState, orderNo, startTime, endTime, dateType, listSource);

                  orderState, orderNo, startTime, endTime, dateType, listSource, notBackSuVip);

				
            count = commonOrderService.countOrderList(uid, state, orderType, orderState, orderNo,

                  startTime, endTime, dateType, listSource);

                  startTime, endTime, dateType, listSource, notBackSuVip);

         } else {

            list = commonOrderService.getOrderByUid(acceptData, page, uid, state, orderType,

                  orderState, orderNo, startTime, endTime, dateType, listSource);

@@ -497,7 +497,7 @@
      BigDecimal shareMoney = null;

      BigDecimal teamMoney = null;

      // VIP预览信息

      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

      if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {

         String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.mineInfo);

         if (!StringUtil.isNullOrEmpty(redisContent)) {

            MineInfoVO vo = new Gson().fromJson(redisContent, MineInfoVO.class);

@@ -803,7 +803,7 @@
    * @param out

    */

   @RequestMapping(value = "teamOrderSearch")

   public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, String key, PrintWriter out) {

   public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, Integer page, String key, PrintWriter out) {

      if (uid == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

@@ -812,127 +812,88 @@
      List<TeamOrderVO> resultList = new ArrayList<>();

      if (StringUtil.isNullOrEmpty(key)) {

         JSONObject data = new JSONObject();

         data.put("count", 0);

         data.put("list", resultList);

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

         return;

      }



      try {

         // 查询此单是否存在分红

         List<TeamOrderVO> tempList = new ArrayList<>();

         List<TeamDividentsSourceOrder> listSourceOrder = teamDividentsSourceOrderService.listByOrderNo(key);

         if (listSourceOrder != null && listSourceOrder.size() > 0) {

            for (TeamDividentsSourceOrder sourceOrder: listSourceOrder) {

               List<TeamDividentsSourceOrderUserMap> listDividents = 
                     teamDividentsSourceOrderUserMapService.listBySourceOrderIdAndTargetUid(sourceOrder.getId(), uid);

               if (listDividents != null && listDividents.size() > 0) {

                  Integer state = null;

                  Date sendTime = null;

                  BigDecimal money = BigDecimal.ZERO; 
                  for (TeamDividentsSourceOrderUserMap teamDividents: listDividents) {

                     money = money.add(teamDividents.getMoney());

                     state = teamDividents.getState();

                     sendTime = teamDividents.getSendTime();

                  }

						
                  TeamOrderVO teamOrderVO = new TeamOrderVO();

                  teamOrderVO.setSourceType(sourceOrder.getSourceType());

                  teamOrderVO.setOrderNo(sourceOrder.getOrderNo());

                  teamOrderVO.setDivMoney(money);

                  teamOrderVO.setDivState(state);

                  if (sendTime != null)

                     teamOrderVO.setAccountTime(TimeUtil.formatDate(sendTime));

                  tempList.add(teamOrderVO);

               }

            }

         if (page == null)

            page = 1;

			
         List<TeamOrderVO> list = teamDividentsSourceOrderUserMapService.searchByOrderNoOrSourceUid((page-1)*20, 20, uid, key);

         if (list == null) {

            list = new ArrayList<>();

         }

         

         if (tempList.size() > 0) {

            List<CommonOrder> listOrder = commonOrderService.listByOrderNo(key);

            if(listOrder != null && listOrder.size() > 0) {

               Map<String, TeamOrderVO> map = new HashMap<String, TeamOrderVO>();

               for (CommonOrder order: listOrder) {

                  Integer sourceType = order.getSourceType();

                  String orderNo = order.getOrderNo();

                  String mapKey = orderNo + "##" + sourceType;

						
                  TeamOrderVO teamVO = map.get(mapKey);

                  if (teamVO != null) {

                     teamVO.setPayment(teamVO.getPayment().add(order.getPayment()));

                  } else {

                     Long orderUid = order.getUserInfo().getId();

                     teamVO = new TeamOrderVO();

                     teamVO.setUid(orderUid);

                     teamVO.setOrderNo(orderNo);

                     teamVO.setSourceType(sourceType);

         if (list.size() > 0) {

            for (int i = 0; i < list.size(); i ++) {

               TeamOrderVO teamVO = list.get(i);

               // 粉丝代数

               ThreeSaleDetail threeDetail = threeSaleDetailService.getByBossUidAndWorkerUid(uid, teamVO.getUid());

               if (threeDetail == null) {

                  list.remove(i);

                  i--;

                  continue;

               }

               teamVO.setTeamGrade(threeDetail.getLevel());

					
               // 粉丝基本信息

               UserInfo userInfo = userInfoService.getUserByIdWithMybatis(teamVO.getUid());

               if (userInfo == null) {

                  list.remove(i);

                  i--;

                  continue;

               }

               teamVO.setNickName(userInfo.getNickName());

               teamVO.setPortrait(userInfo.getPortrait());

					
					
               BigDecimal payment = BigDecimal.ZERO;

               List<CommonOrder> listOrder = commonOrderService.listBySourceTypeAndOrderId(teamVO.getSourceType(), teamVO.getOrderNo());

               if (listOrder != null && listOrder.size() > 0) {

                  for (CommonOrder order: listOrder) {

                     payment = payment.add(order.getPayment());

                     teamVO.setSourceName(order.getChildSourceType());

                     teamVO.setPayment(order.getPayment());

                     teamVO.setDownTime(TimeUtil.formatDate(order.getThirdCreateTime()));

						
							
                     // 下单时等级

                     UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(order.getUrank());

                     if (userLevel == null)

                        userLevel = UserLevelEnum.daRen;

                     teamVO.setUserRank(UserLevelUtil.getShowLevel(userLevel).name());

                     

                     // 粉丝基本信息

                     UserInfo userInfo = userInfoService.getUserByIdWithMybatis(orderUid);

                     if (userInfo == null) {

                        continue;

                     }

                     teamVO.setUid(orderUid);

                     teamVO.setNickName(userInfo.getNickName());

                     teamVO.setPortrait(userInfo.getPortrait());

                     // 结算时间

                     Date settleTime = order.getSettleTime();

                     if (settleTime != null) 
                        teamVO.setSettleTime(TimeUtil.formatDate(settleTime));

                     

                     // 粉丝代数

                     ThreeSaleDetail threeDetail = threeSaleDetailService.getByBossUidAndWorkerUid(uid, orderUid);

                     if (threeDetail == null) {

                        continue;

                     }

                     teamVO.setTeamGrade(threeDetail.getLevel());

                  }

                  // 结算时间

                  Date settleTime = order.getSettleTime();

                  if (settleTime != null) 
                     teamVO.setSettleTime(TimeUtil.formatDate(settleTime));

						
                  // 分红信息

                  for (TeamOrderVO teamOrderVO: tempList) {

                     if (teamOrderVO.getSourceType() == sourceType) {

                        teamVO.setDivMoney(teamOrderVO.getDivMoney());

                        teamVO.setDivState(teamOrderVO.getDivState());

                        teamVO.setAccountTime(teamOrderVO.getAccountTime());

                        break;

                     }

                  }

						
                  // 维权信息

                  Integer orderState = order.getState();

                  if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime()) && CommonOrder.STATE_WQ == orderState) {

                     if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

                        UserOrderWeiQuanRecord record = userOrderWeiQuanRecordService.selectByOrderInfoAndUid(uid, order.getTradeId(), sourceType);

                        if (record != null) {

                           teamVO.setServiceTime(TimeUtil.formatDate(record.getCreateTime()));

                     // 维权信息

                     Integer orderState = order.getState();

                     if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime()) && CommonOrder.STATE_WQ == orderState) {

                        if (order.getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {

                           UserOrderWeiQuanRecord record = userOrderWeiQuanRecordService.selectByOrderInfoAndUid(uid, order.getTradeId(), order.getSourceType());

                           if (record != null) {

                              teamVO.setServiceTime(TimeUtil.formatDate(record.getCreateTime()));

                           }

                        }

                     }

							
                  }

                  String orderTime = "下单" + teamVO.getDownTime() ;

                  if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {

                     orderTime += "\n收货" + teamVO.getSettleTime();

                  }

                  if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {

                     orderTime += "\n售后" + teamVO.getServiceTime();

                  }

                  teamVO.setOrderTime(orderTime);

                  map.put(mapKey, teamVO);

               }

               teamVO.setPayment(payment);

               

               // 遍历放入数组

               Iterator<Entry<String, TeamOrderVO>> entries = map.entrySet().iterator();

               while(entries.hasNext()){

                   Entry<String, TeamOrderVO> entry = entries.next();

                   resultList.add(entry.getValue());

					
               // 订单时间信息

               String orderTime = "下单" + teamVO.getDownTime() ;

               if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {

                  orderTime += "\n收货" + teamVO.getSettleTime();

               }

               if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {

                  orderTime += "\n售后" + teamVO.getServiceTime();

               }

               teamVO.setOrderTime(orderTime);

            }

         }

         

@@ -945,14 +906,15 @@
                  return new JsonPrimitive("");

               } else {

                  // 保留2位小数

                  return new JsonPrimitive(MoneyBigDecimalUtil.getWithNoZera(value) + "");

                  value = value.setScale(2, BigDecimal.ROUND_DOWN);

                  return new JsonPrimitive(value.toString());

               }

            }

         });

         Gson gson = gsonBuilder.create();

			
         JSONObject data = new JSONObject();

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

         data.put("count", teamDividentsSourceOrderUserMapService.countSearchByOrderNoOrSourceUid(uid, key));

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

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

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户不存在"));