唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 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;



@@ -28,6 +25,7 @@
import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

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

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

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

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

@@ -36,14 +34,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;

@@ -125,7 +120,7 @@


   @Resource

   private HongBaoV2Service hongBaoV2Service;

	


   @Resource

   private HongBaoOrderService hongBaoOrderService;



@@ -134,89 +129,71 @@


   @Resource

   private CommonOrderGoodsService commonOrderGoodsService;

	


   @Resource

   private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;

	
	


   @Resource

   private JumpDetailV2Service jumpDetailV2Service;

	


   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;

	


   @Resource

   private UserInviteService userInviteService;

	


   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

	


   @Resource

   private OrderHongBaoMapService orderHongBaoMapService;

	


   @Resource

   private  PreviewInfoService previewInfoService;

	
   private PreviewInfoService previewInfoService;



   @Resource

   private TeamDividentsSourceOrderService teamDividentsSourceOrderService;

	


   @Resource

   private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;

	


   @Resource

   private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;

	


   @Resource

   private ThreeSaleDetailService threeSaleDetailService;

	
	


   /**

    * 订单列表

    * 处理搜索条件

    * 

    * @param acceptData

    * @param page

    * @param uid

    * @param state

    *            状态：0全部 1-未到账 2-已到账 3-已失效 4已收货

    * @param type

    *            类型：1-返利订单 2-分享订单 3-邀请订单

    * @param orderState

    *            1有效订单 2 维权订单 3失效订单

    * @param orderNo

    *            订单号

    * @param startTime

    *            起始时间

    * @param endTime

    *            结束时间

    * @param slotTime

    *            时间段：1-最近三天 2-最近七天 3最近半月 4本月 5近三月 6近半年

    * @param dateType

    *            1-今日 2-昨天 3-本月 4-上个月 |

    * @param source 
    *          页面来源：welfareCore-福利中心、bonus -奖金统计（我的界面）

    * @param out

    * @param filter

    */

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

   public void getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, String type,

         Integer orderState, String orderNo, String startTime, String endTime, Integer slotTime, Integer dateType,

         Integer goodsType, String source, PrintWriter out) {

      if (uid == null) {

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

         return;

   private void handleSearchFilter(SearchFilterOrder filter) {

      Integer goodsType = filter.getGoodsType();

      if (goodsType != null && goodsType == 0) {

         goodsType = null;

         filter.setGoodsType(goodsType);

      }



      if (page == null || page < 1)

         page = 1;



      // 搜索内容、订单号

      if (!StringUtil.isNullOrEmpty(orderNo)

            && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {

         searchOrder(acceptData, orderNo, page, uid, out);

         return;

      List<Integer> listSource = new ArrayList<>();

      if (goodsType != null) {

         listSource.add(goodsType);

      }

      filter.setListSource(listSource);



      // 订单类型

      String type = filter.getType();

      Integer orderType = null;

      if (StringUtil.isNullOrEmpty(type)) {

         orderType = null;

      } else if (!"0".equalsIgnoreCase(type)) {

         orderType = Integer.parseInt(type);

      }

      filter.setOrderType(orderType);



      // 转换状态

      Integer orderState = filter.getOrderState();

      Integer state = filter.getState();

      if (state != null) {

         if (state == 0) {

            state = null; // 所有

@@ -231,19 +208,14 @@
      if (state != null && orderState != null && (orderState == 2 || orderState == 3)) {

         state = null;

      }



      // 订单类型

      Integer orderType = null;

      if (StringUtil.isNullOrEmpty(type)) {

         orderType = null;

      } else if (!"0".equalsIgnoreCase(type)) {

         orderType = Integer.parseInt(type);

      }



      if (goodsType != null && goodsType == 0)

         goodsType = null;

      filter.setState(state);

      filter.setOrderState(orderState);



      // 筛选时间

      Integer dateType = filter.getDateType();

      String startTime = filter.getStartTime();

      String endTime = filter.getEndTime();

      Integer slotTime = filter.getSlotTime();

      if (slotTime != null) {

         try {

            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");

@@ -277,28 +249,81 @@
            e.printStackTrace();

         }

      }

      filter.setDateType(dateType);

      filter.setStartTime(startTime);



      if (endTime != null && endTime.trim().length() > 0) {

         endTime += " 23:59:59";

      }

      filter.setEndTime(endTime);



      List<Integer> listSource = new ArrayList<>();

      if (goodsType != null) {

         listSource.add(goodsType);

   }



   /**

    * 订单列表

    * 
    * @param acceptData

    * @param page

    * @param uid

    * @param state      状态：0全部 1-未到账 2-已到账 3-已失效 4已收货

    * @param type       类型：1-返利订单 2-分享订单 3-邀请订单

    * @param orderState 1有效订单 2 维权订单 3失效订单

    * @param orderNo    订单号

    * @param startTime  起始时间

    * @param endTime    结束时间

    * @param slotTime   时间段：1-最近三天 2-最近七天 3最近半月 4本月 5近三月 6近半年

    * @param dateType   1-今日 2-昨天 3-本月 4-上个月 |

    * @param source     页面来源：welfareCore-福利中心、bonus -奖金统计（我的界面）

    * @param out

    */

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

   public void getOrderList(AcceptData acceptData, Integer page, SearchFilterOrder filter, PrintWriter out) {

      Long uid = filter.getUid();

      if (uid == null) {

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

         return;

      }



      if (page == null || page < 1)

         page = 1;



      handleSearchFilter(filter);

      String startTime = filter.getStartTime();

      String endTime = filter.getEndTime();

      Integer orderType = filter.getOrderType();

      Integer dateType = filter.getDateType();

      Integer state = filter.getState();

      List<Integer> listSource = filter.getListSource();

      Integer orderState = filter.getOrderState();



      try {

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

            if (listSource.size() == 0) {

               listSource.add(Constant.SOURCE_TYPE_TAOBAO);

               listSource.add(Constant.SOURCE_TYPE_JD);

               listSource.add(Constant.SOURCE_TYPE_PDD);

            }

         }

			
         // 搜索内容、订单号

         String orderNo = filter.getOrderNo();

         if (!StringUtil.isNullOrEmpty(orderNo)

               && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {

            searchOrder(acceptData, orderNo, page, uid, listSource, out);

            return;

         }



         // 筛选结果顶部统计

         String validMoney = "0.00";

         String invalidMoney = "0.00";

         if (page == 1) {

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

                  orderNo, state, startTime, endTime, listSource);

            BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, filter.getDateType(),

                  orderType, 1, orderNo, state, startTime, endTime, listSource);

            if (predictMoney != null)

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



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

                  orderNo, state, startTime, endTime, listSource);

            BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, filter.getDateType(),

                  orderType, 2, orderNo, state, startTime, endTime, listSource);

            if (postSaleMoney != null)

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



@@ -310,20 +335,20 @@
               }

            }

         }

			
			


         long count = 0L;

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

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

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

                  startTime, endTime, dateType, listSource);



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

                  endTime, dateType, listSource);

         } else {

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

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

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

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

                  startTime, endTime, dateType, listSource);

            count = commonOrderService.countGroupOrderNoByUid(uid, state, orderType, orderState, orderNo, startTime,

                  endTime, dateType, listSource);

         }



         // 判断是否需要显示订单找回提示 8秒内请求3次触发

@@ -352,16 +377,19 @@


   /**

    * 搜索订单

    * 
    * @param key

    * @param out

    */

   private void searchOrder(AcceptData acceptData, String key, Integer page, Long uid, PrintWriter out) {

   private void searchOrder(AcceptData acceptData, String key, Integer page, Long uid, List<Integer> listSource, PrintWriter out) {

      try {

         long count = 0;

         List<CommonOrderVO> list = null;

         if (NumberUtil.isNumeric(key.replace("-", ""))) {

            list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null,

                  null);

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

               list =   commonOrderService.getOrderList(acceptData, page, uid, null, null, null, key, null, null, null,listSource);

            } else

               list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null, listSource);

         }



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

@@ -393,9 +421,7 @@
    * 用户订单统计

    * 

    * @param acceptData

    * @param uid

    *            用户id

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

    * @param uid        用户id type 类型：0全部、1淘宝 2京东、拼多多

    * @param out

    */

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

@@ -463,9 +489,10 @@


   /**

    * 统计奖金

    * 
    * @param acceptData

    * @param uid

    * @param dateType  1-今日 2-昨天 3-本月 4-上个月

    * @param dateType   1-今日 2-昨天 3-本月 4-上个月

    * @param out

    */

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

@@ -497,7 +524,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);

@@ -511,14 +538,13 @@
            }

         }

      }

		


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

@@ -527,9 +553,9 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



	
   /**

    * 返利说明

    * 
    * @param acceptData

    * @param uid

    * @param orderNo

@@ -551,9 +577,10 @@
      }



      // 红包信息

      List<HongBaoOrder> hoList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo, sourceType, uid);

      List<HongBaoOrder> hoList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo, sourceType,

            uid);

      HongBaoCountVO hongBaoCountVO = hongBaoOrderService.getHongBaoCountVO(hoList);

		


      Integer hongBaoState = hongBaoCountVO.getCurrentState();

      String stateDesc = "";

      String predictDesc = "";

@@ -565,7 +592,7 @@
      } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {

         stateDesc = "已失效";

      }

		


      int type = 0;

      String typeName = "";

      int hongBaoType = hoList.get(0).getHongBaoV2().getType();

@@ -580,8 +607,8 @@
            || HongBaoV2.TYPE_ERJI == hongBaoType) {

         type = 3;

         typeName = "收益";

      } 
		
      }



      List<Long> goodsIdList = new ArrayList<>();

      if (hoList != null)

         for (HongBaoOrder hongBaoOrder : hoList) {

@@ -594,8 +621,7 @@
      if (goodsList != null)

         for (CommonOrderGoods goods : goodsList)

            orderGoodsMap.put(goods.getId(), goods);

		
		


      OrderRebateVO orderRebateVO = new OrderRebateVO();

      // 红包信息

      BigDecimal hongBao = hongBaoCountVO.getValidMoney();

@@ -603,9 +629,9 @@
         List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderNo);

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

            BigDecimal weiQuanMoney = commonOrderService.getWeiQuanMoney(listWQ, sourceType, uid);

				


            orderRebateVO.setWq(true);

            orderRebateVO.setWqMoney("¥"+ weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN));

            orderRebateVO.setWqMoney("¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN));

            if (hongBao.compareTo(weiQuanMoney) > 0) {

               orderRebateVO.setWqDesc("部分售后退回");

            } else {

@@ -615,14 +641,14 @@
            hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);

         }

      }

		


      // 红包获得者

      HongBaoV2 hongBaoV2 = hoList.get(0).getHongBaoV2();

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

      if (userLevel == null)

         userLevel = UserLevelEnum.daRen;

      UserLevelEnum upperLevel =  UserLevelEnum.superVIP;

			
      UserLevelEnum upperLevel = UserLevelEnum.superVIP;



      // 订单购买者

      CommonOrder commonOrder1 = hoList.get(0).getCommonOrder();

      Date downTime = commonOrder1.getThirdCreateTime();

@@ -630,77 +656,80 @@
      if (buyer == null) {

         buyer = UserLevelEnum.daRen;

      }

		


      BigDecimal upperTotalMoney = new BigDecimal(0);

      List<GoodsRebateVO> voList = new ArrayList<>();

      for (HongBaoOrder hongBaoOrder : hoList) {

         if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_SHIXIAO)

            hongBaoOrder.getHongBaoV2().setMoney(new BigDecimal(0));

		


         GoodsRebateVO goodsVO = new GoodsRebateVO();

			


         // 标题、图片

         CommonOrder commonOrder = hongBaoOrder.getCommonOrder();

         if (orderGoodsMap.get(commonOrder.getCommonOrderGoods().getId()) != null) {

            goodsVO.setTitle(orderGoodsMap.get(commonOrder.getCommonOrderGoods().getId()).getTitle());

            goodsVO.setPicture(orderGoodsMap.get(commonOrder.getCommonOrderGoods().getId()).getPicture());

         }

			


         // 实付款

         BigDecimal payment = hongBaoOrder.getCommonOrder().getPayment();

         // 若已结算 -显示结算金额

         Integer orderState = hongBaoOrder.getCommonOrder().getState();

         if (hongBaoOrder.getCommonOrder().getSettlement() != null 
         if (hongBaoOrder.getCommonOrder().getSettlement() != null

               && (orderState == CommonOrder.STATE_JS || orderState == CommonOrder.STATE_WQ))

            payment = hongBaoOrder.getCommonOrder().getSettlement();

         if (payment == null)

            payment = new BigDecimal(0);

         goodsVO.setActualPay("¥" + payment.setScale(2, BigDecimal.ROUND_DOWN));

			


         BigDecimal fanli = hongBaoOrder.getHongBaoV2().getMoney();

         // 基础佣金

         BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);

         goodsVO.setCommision("¥" +commission.setScale(2, BigDecimal.ROUND_DOWN));

		
         // 平台补贴  = 返利 - 基础佣金

         goodsVO.setCommision("¥" + commission.setScale(2, BigDecimal.ROUND_DOWN));



         // 平台补贴 = 返利 - 基础佣金

         goodsVO.setSubsidy("¥" + fanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));

         //  达人补贴

         // 达人补贴

         if (userLevel != UserLevelEnum.daRen) {

            BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, UserLevelEnum.daRen);

            BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder,

                  UserLevelEnum.daRen);

            goodsVO.setOriginSubsidy("¥" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");

         }

			


         if (type == 3) { // 奖金

            goodsVO.setBonus("¥" + fanli.setScale(2, BigDecimal.ROUND_DOWN) +"");

            goodsVO.setBonus("¥" + fanli.setScale(2, BigDecimal.ROUND_DOWN) + "");

         }

			


         voList.add(goodsVO);

			
         if (type == 1 ) {

            upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));



         if (type == 1) {

            upperTotalMoney = upperTotalMoney

                  .add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

         } else if (type == 2) {

            upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));

            upperTotalMoney = upperTotalMoney

                  .add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));

         } else if (type == 3) {

            List<UserTeamLevel> bossLevelList = new ArrayList<>();

            if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {

               bossLevelList.add(new UserTeamLevel(null, UserLevelEnum.superVIP));

               upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFirstInviteMoney(commonOrder,

                     buyer, bossLevelList));

               upperTotalMoney = upperTotalMoney.add(

                     orderHongBaoMoneyComputeService.computeFirstInviteMoney(commonOrder, buyer, bossLevelList));

            } else {

               Integer bRank = hongBaoV2Service.getDirectBossUrankByPid(hongBaoOrder.getHongBaoV2().getParent().getId());

               Integer bRank = hongBaoV2Service

                     .getDirectBossUrankByPid(hongBaoOrder.getHongBaoV2().getParent().getId());

               UserLevelEnum directBoss = UserLevelUtil.getByOrderRank(bRank);

               if (directBoss == null) {

                  directBoss = UserLevelEnum.daRen;

               }

               bossLevelList.add(new UserTeamLevel(null, directBoss));

               bossLevelList.add(new UserTeamLevel(null, UserLevelEnum.superVIP));

               upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeSecondInviteMoney(commonOrder,

                     buyer, bossLevelList));

               upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService

                     .computeSecondInviteMoney(commonOrder, buyer, bossLevelList));

            }

         }

      }

		
		


      orderRebateVO.setFanLiDesc(predictDesc + typeName);

      orderRebateVO.setFanLi("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN));

      orderRebateVO.setType(type);

@@ -711,7 +740,7 @@
      } else {

         orderRebateVO.setUserLevel(userLevel.name());

      }

		


      // 超级会员返利

      if (upperLevel != null) {

         orderRebateVO.setUpperFanLi("¥" + upperTotalMoney);

@@ -722,23 +751,26 @@
      boolean rewardSuccess = false;

      List<String> listNo = new ArrayList<String>();

      listNo.add(orderNo);

      List<UserSystemCouponRecord> useRecord = userSystemCouponRecordService.getRecordByOrderNoList(sourceType, listNo);

      List<UserSystemCouponRecord> useRecord = userSystemCouponRecordService.getRecordByOrderNoList(sourceType,

            listNo);

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

         for (UserSystemCouponRecord couponRecord : useRecord) {

            Integer state = couponRecord.getState();

            String cType = couponRecord.getCouponType();

            if (CouponTypeEnum.rebatePercentCoupon.name().equals(cType) && UserSystemCouponRecord.STATE_SUCCESS == state) {

            if (CouponTypeEnum.rebatePercentCoupon.name().equals(cType)

                  && UserSystemCouponRecord.STATE_SUCCESS == state) {

               rewardSuccess = true;

               break;

            } else if (CouponTypeEnum.freeCoupon.name().equals(cType) || CouponTypeEnum.welfareFreeCoupon.name().equals(cType)

            } else if (CouponTypeEnum.freeCoupon.name().equals(cType)

                  || CouponTypeEnum.welfareFreeCoupon.name().equals(cType)

                  || CouponTypeEnum.freeCouponBuy.name().equals(cType)) {

               freeState = state;

               break;

            }

         }

      }

		
      if (rewardSuccess) {  // 已使用奖励券



      if (rewardSuccess) { // 已使用奖励券

         JSONObject params = new JSONObject();

         params.put("orderNo", orderNo);

         params.put("goodsType", sourceType + "");

@@ -749,7 +781,7 @@
         orderRebateVO.setCouponType(1);

         orderRebateVO.setCouponUse(true);

         orderRebateVO.setCouponText("奖励成功");

         orderRebateVO.setCouponDesc("已再返¥" +couponMoney.setScale(2, BigDecimal.ROUND_DOWN));

         orderRebateVO.setCouponDesc("已再返¥" + couponMoney.setScale(2, BigDecimal.ROUND_DOWN));

         orderRebateVO.setCouponParams(params.toString());

         orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));

      } else if (freeState > 0) { // 已使用免单券

@@ -771,12 +803,13 @@
      } else {

         Date accountTime = hongBaoV2.getGetTime();

         // 到账时间 -红包金额限制

         if (accountTime != null && hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) <= 0) { 
         if (accountTime != null && hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) <= 0) {

            boolean vip = userInviteService.verifyVIP(uid);

            Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);

            long currentTime = java.lang.System.currentTimeMillis();

            if (endDay.getTime() > currentTime && !vip) {

               UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);

               UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo,

                     null);

               if (couponRecord == null) {

                  orderRebateVO.setCoupon(true);

                  orderRebateVO.setCouponType(1);

@@ -786,150 +819,117 @@
            }

         }

      }

		


      JSONObject data = new JSONObject();

      data.put("result", orderRebateVO);

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

   }

	
	


   /**

    * 用户订单统计

    * 

    * @param acceptData

    * @param uid

    *            用户id

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

    * @param uid        用户id type 类型：0全部、1淘宝 2京东、拼多多

    * @param out

    */

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

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

   @RequestMapping(value = "teamOrderSearch")

   public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, Integer page, String key,

         PrintWriter out) {

      if (uid == null) {

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

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

         return;

      }

		
		


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

							
                     // 粉丝代数

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



                     // 结算时间

                     Date settleTime = order.getSettleTime();

                     if (settleTime != null)

                        teamVO.setSettleTime(TimeUtil.formatDate(settleTime));



                     // 维权信息

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

                           }

                        }

                     }



                  }

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

               teamVO.setPayment(payment);



               // 订单时间信息

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

            }

         }

			
			


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

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

            @Override

@@ -938,14 +938,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("用户不存在"));