足迹、收藏订单兼容新需求

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

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

@@ -1,13 +1,16 @@
package com.yeshi.fanli.controller.client.v2;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

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;



@@ -18,9 +21,17 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.order.UserTeamLevel;

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

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

import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum;

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

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;

@@ -28,6 +39,9 @@
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;

@@ -43,11 +57,16 @@
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

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

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

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

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

@@ -55,6 +74,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.user.UserLevelUtil;

@@ -63,6 +83,8 @@
import com.yeshi.fanli.vo.order.HongBaoCountVO;

import com.yeshi.fanli.vo.order.OrderCountVO;

import com.yeshi.fanli.vo.order.OrderRebateVO;

import com.yeshi.fanli.vo.order.TeamOrderVO;

import com.yeshi.fanli.vo.user.MineInfoVO;

import com.yeshi.fanli.vo.user.UserInfoExtraVO;

import com.yeshi.fanli.vo.user.UserSettingsVO;



@@ -114,6 +136,7 @@
   @Resource

   private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;

   

	
   @Resource

   private JumpDetailV2Service jumpDetailV2Service;

   

@@ -128,6 +151,23 @@
   

   @Resource

   private OrderHongBaoMapService orderHongBaoMapService;

	
   @Resource

   private  PreviewInfoService previewInfoService;

	
   @Resource

   private TeamDividentsSourceOrderService teamDividentsSourceOrderService;

	
   @Resource

   private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;

	
   @Resource

   private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;

	
   @Resource

   private ThreeSaleDetailService threeSaleDetailService;

	
	


   /**

    * 订单列表

@@ -246,17 +286,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();



@@ -274,9 +319,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);

@@ -451,32 +497,36 @@
         show = hongBaoV2CountService.getHongBaoCount(uid, null) > 0;

      }



      BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 1, null);

      BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2, null);

      BigDecimal selfMoney = null;

      BigDecimal shareMoney = null;

      BigDecimal teamMoney = null;

      // VIP预览信息

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

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

         if (!StringUtil.isNullOrEmpty(redisContent)) {

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

            if (vo != null) {

               if (!StringUtil.isNullOrEmpty(vo.getSelfRebate()))

                  selfMoney = new BigDecimal(vo.getSelfRebate());

               if (!StringUtil.isNullOrEmpty(vo.getShareBonus()))

                  shareMoney = new BigDecimal(vo.getShareBonus());

               if (!StringUtil.isNullOrEmpty(vo.getTeamBonus()))

                  teamMoney = new BigDecimal(vo.getTeamBonus());

            }

         }

      }

		
      if (selfMoney == null) {

         selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 1, null);

         shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2, null);

         teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);

      }

		
      

      JSONObject data = new JSONObject();

      data.put("show", show);

      data.put("selfMoney", selfMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

      data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

		
		
      BigDecimal teamMoney = new BigDecimal(0);

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

         teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);

      } else {

         BigDecimal bonus = null;

         BigDecimal dividend = null;  // TODO 分红统计

         if (dateType == 4) { // 已到账

            dividend = new BigDecimal(0);

            bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 2);

         } else { // 未失效

            bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 4);

         }

			
         dividend = new BigDecimal(0);

         // 总团队奖励

         teamMoney = bonus.add(dividend);

      }

      data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

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

   }

@@ -746,4 +796,171 @@
      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }

   

	
   /**

    * 用户订单统计

    * 
    * @param acceptData

    * @param uid

    *            用户id

    *    type 类型：0全部、1淘宝 2京东、拼多多

    * @param out

    */

   @RequestMapping(value = "teamOrderSearch")

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

      if (uid == null) {

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

         return;

      }

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

      if (StringUtil.isNullOrEmpty(key)) {

         JSONObject data = new JSONObject();

         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 (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);

                     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());

							
                     // 粉丝代数

                     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()));

                        }

                     }

                  }

                  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);

               }

					
               // 遍历放入数组

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

               while(entries.hasNext()){

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

                   resultList.add(entry.getValue());

               }

            }

         }

			
			
         GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

         gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

            @Override

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

               if (value == null) {

                  return new JsonPrimitive("");

               } else {

                  // 保留2位小数

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

               }

            }

         });

         Gson gson = gsonBuilder.create();

			
         JSONObject data = new JSONObject();

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

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

      } catch (Exception e) {

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

         return;

      }

   }

}