邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -13,11 +13,11 @@
import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.taobao.TbImgUtil;



import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

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

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

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

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

@@ -30,6 +30,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

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

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

@@ -82,15 +83,14 @@
   public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,

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

         throws CommonOrderException {

      return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderState, orderNo, startTime,

            endTime, dateType);

      return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,

            dateType);

   }



   @Override

   public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,

         String startTime, String endTime, Integer dateType) throws CommonOrderException {

      return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime, endTime,

            dateType);

      return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType);

   }



   @Override

@@ -109,31 +109,37 @@
      }



      // 商品信息

      List<CommonOrderVO> listGoods = commonOrderMapper.listByOrderNoAndType(listOrder);

      List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);

      // 订单商品为空

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

         return listOrder;

      }



      // 数据加工重新组织

      listDataFactory(listOrder, listGoods);

      listDataFactory(listOrder, listGoods, uid);



      return listOrder;

   }



   @Override

   public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day) {

      return commonOrderMapper.countOrderByHongBaoType(uid, day);

   public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {

      return commonOrderMapper.countHistoryOrder(uid, day);

   }



   @Override

   public long countOrder(Long uid, Integer type, Integer day) {

      return commonOrderMapper.countBonusOrder(uid, type, day);

   public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime) {

      return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime);

   }



   @Override

   public BigDecimal countOrderMoney(Long uid, Integer type, Integer day) {

      return commonOrderMapper.countBonusOrderMoney(uid, type, day);

   public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {

      return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);

   }

	
   @Override

   public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, 
         String startTime, String endTime) {

      return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);

   }



   @Override

@@ -142,7 +148,7 @@
      return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);

   }



   public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods) {

   public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {



      /* 组合商品信息 */

      for (CommonOrderVO commonOrder : listGoods) {

@@ -171,10 +177,16 @@
                  e.printStackTrace();

               }



               String picture = commonGoodsVO.getPicture();

               if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {

                  commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));

               }

					
               Integer hongBaoType = order.getHongBaoType();

               // 邀请订单信息保护

               if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_ERJI == hongBaoType) {

                     || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

                  Map<String, String> titleMap = new HashMap<String, String>();

                  titleMap.put("content", "为保障用户隐私，商品信息已隐藏!");

                  titleMap.put("fontColor", "#888888");

@@ -183,9 +195,15 @@
                  commonGoodsVO.setGoodsTitle(titleMap);

               }



               // 购买数量

               commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "件");

               String settlement = commonOrder.getTotalSettlement().setScale(2, BigDecimal.ROUND_DOWN).toString();

               commonGoodsVO.setActualPay("实付款：¥" + settlement);



               BigDecimal totalSettlement = commonOrder.getTotalSettlement();

               if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {

                  totalSettlement = commonOrder.getTotalPayment();

               }

               // 实付款

               commonGoodsVO.setActualPay("实付款：¥" + totalSettlement);



               listOrderGoods.add(commonGoodsVO);



@@ -208,14 +226,11 @@
      SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");



      for (CommonOrderVO order : listOrder) {

         Date createTime = order.getCreateTime();

         if (createTime != null) {

            order.setObtainTime(createTime.getTime());

         }



         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

            order.setDownTime("下单时间：" + format.format(thirdCreateTime));

            order.setObtainTime(thirdCreateTime.getTime());

         }



         Date settleTime = order.getSettleTime();

@@ -226,10 +241,25 @@
         /* 订单状态 转换处理 */

         String orderStateContent = "";

         Map<String, String> orderStateMap = new HashMap<String, String>();



         Integer hongBaoState = order.getHongBaoState();



			
         // 订单状态

         Integer orderState = order.getState();

         // 红包状态

         Integer hongBaoState = order.getHongBaoState();

			
         Integer stateWholeOrder = order.getStateWholeOrder();

         if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {

            // 整个订单部分失效：判断真实状态 订单、红包

            CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());

            if (buFenOrder != null) {

               // 有效的订单状态

               orderState = buFenOrder.getState();

               // 有效的红包状态

               hongBaoState = buFenOrder.getHongBaoState();

            }

         } 
			
			
         if (CommonOrder.STATE_FK == orderState) {

            orderStateContent = "已付款";

         } else if (CommonOrder.STATE_JS == orderState) {

@@ -240,8 +270,8 @@
            orderStateContent = "已维权";



            /* 订单维权 判断是否全部维权 */

            List<TaoBaoWeiQuanOrder> listWQ = 
                  taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(order.getOrderNo(), "维权成功");

            List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

                  .selectListByOrderIdAndState(order.getOrderNo(), "维权成功");



            boolean isPart = false;// 默认失效



@@ -277,14 +307,14 @@
            hongbaoInfo = "返利";

            order.setOrderOrigin("1");

            order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            // 分享

            hongbaoInfo = "奖金";

            order.setOrderOrigin("2");

            order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType) {

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");

@@ -361,62 +391,258 @@


   @Transactional

   @Override

   public CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException {

      CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),

            Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());

      if (commonOrder == null)// 新增

      {

         commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

         CommonOrderGoods goods = new CommonOrderGoods();

         goods.setGoodsId(taoBaoOrder.getAuctionId() + "");

         goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

         // 商品是否已经插入

         List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper

               .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());

         if (commonGoodsList.size() <= 0)// 不存在就插入商品

         {

            TaoBaoGoodsBrief taoBaoGoods = null;

            try {

               taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            }

            if (taoBaoGoods != null) {

               goods = CommonOrderGoodsFactory.create(taoBaoGoods);

            }

            goods.setCreateTime(new Date());

            goods.setUpdateTime(new Date());

            commonOrderGoodsMapper.insertSelective(goods);

         } else

            goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());

         commonOrder.setCommonOrderGoods(goods);

         commonOrder.setUserInfo(new UserInfo(uid));

         commonOrder.setCreateTime(new Date());

         commonOrderMapper.insertSelective(commonOrder);

			


         return commonOrder;

      } else {// 修改

         // 已经结算或者已经失效的订单不处理

         if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX)

            return commonOrder;

         CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

         CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());

         updateCommonOrder.seteIncome(newCommonOrder.geteIncome());

         updateCommonOrder.setEstimate(newCommonOrder.getEstimate());

         updateCommonOrder.setPayment(newCommonOrder.getPayment());

         updateCommonOrder.setSettlement(newCommonOrder.getSettlement());

         updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());

         updateCommonOrder.setState(newCommonOrder.getState());

         updateCommonOrder.setUpdateTime(new Date());

         commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

         return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());

   public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {

      List<CommonOrder> commonOrderList = new ArrayList<>();

      // 判断所有的订单状态

      int invalidCount = 0;

      for (TaoBaoOrder tb : taoBaoOrders) {

         if ("订单失效".equalsIgnoreCase(tb.getOrderState())) {

            invalidCount++;

         }

      }



      // 获取整体订单的状态

      int wholeOrderState = 0;

      if (taoBaoOrders.size() == invalidCount)

         wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;

      else if (invalidCount == 0)

         wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;

      else

         wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;



      for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {

         CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),

               Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());

         if (commonOrder == null)// 新增

         {

            commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

            CommonOrderGoods goods = new CommonOrderGoods();

            goods.setGoodsId(taoBaoOrder.getAuctionId() + "");

            goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);



            // 商品是否已经插入

            List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper

                  .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());

            if (commonGoodsList.size() <= 0)// 不存在就插入商品

            {

               TaoBaoGoodsBrief taoBaoGoods = null;

               try {

                  taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

               } catch (TaobaoGoodsDownException e) {

                  e.printStackTrace();

               }

               if (taoBaoGoods != null) {

                  goods = CommonOrderGoodsFactory.create(taoBaoGoods);

               }

               goods.setCreateTime(new Date());

               goods.setUpdateTime(new Date());

               commonOrderGoodsMapper.insertSelective(goods);

            } else

               goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());

            commonOrder.setCommonOrderGoods(goods);

            commonOrder.setUserInfo(new UserInfo(uid));

            commonOrder.setCreateTime(new Date());

            commonOrder.setStateWholeOrder(wholeOrderState);

            commonOrderMapper.insertSelective(commonOrder);



            commonOrderList.add(commonOrder);

            continue;

         } else {// 修改

            // 已经结算或者已经失效的订单不处理

            if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX) {

               commonOrderList.add(commonOrder);

               continue;

            }

            CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

            CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());

            updateCommonOrder.seteIncome(newCommonOrder.geteIncome());

            updateCommonOrder.setEstimate(newCommonOrder.getEstimate());

            updateCommonOrder.setPayment(newCommonOrder.getPayment());

            updateCommonOrder.setSettlement(newCommonOrder.getSettlement());

            updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());

            updateCommonOrder.setState(newCommonOrder.getState());

            updateCommonOrder.setStateWholeOrder(wholeOrderState);

            updateCommonOrder.setUpdateTime(new Date());

            commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

            commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));

            continue;

         }

      }

      return commonOrderList;

   }



   @Override

   public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,

         String endTime, Integer day) {

      return commonOrderMapper.countMoneyGroupOrderNoByUid(uid, type, orderNo, startTime, endTime, day);

   public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {

      return commonOrderMapper.countByUidAndOrderStateWithOrderBalanceTime(uid, state, minDate, maxDate);

   }

	
	
   @Override

   public List<CommonOrderVO> listQueryByUid(long start, int count, Long uid, Integer state, Integer type,

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

         throws CommonOrderException {

		
			
      List<CommonOrderVO> list = commonOrderMapper.listQueryByUid(start, count, uid, state, type, 
            orderState, orderNo, startTime, endTime, dateType);

		
      if (list == null) {

         list = new ArrayList<CommonOrderVO>();

      }

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

         return list;

      }

		
      SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");

      for (CommonOrderVO order : list) {

			
         // 下单时间

         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

            order.setDownTime(format.format(thirdCreateTime));

         }

         // 收货时间

         Date settleTime = order.getSettleTime();

         if (settleTime != null) {

            order.setReceiveTime(format.format(settleTime));

         }

			
         // 到账时间

         Date accountTime = order.getAccountTime();

         if (accountTime != null) {

            order.setHongBaoDate(format.format(accountTime));

         }

			
         BigDecimal settlement = order.getSettlement();

         if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {

            order.setPayment(settlement); // 实际付款金额

         }



         /* 订单返利类型 转换 */

         Integer hongBaoType = order.getHongBaoType();

         if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {

            // 自购

            order.setHongBaoType(1);

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            // 分享

            order.setHongBaoType(2);

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

            order.setHongBaoType(3);

         }



         Integer hongBaoState = order.getHongBaoState();

         if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {

            // 未到账

            order.setHongBaoState(1);



         } else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {

            // 已到账

            order.setHongBaoState(2);



         } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {

            // 已失效

            order.setHongBaoState(3);

         }

			
      }

		
      return list;

			
   }



   @Override

   public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,

         String startTime, String endTime, Integer dateType) throws CommonOrderException {

      return commonOrderMapper.countQueryByUid(uid, state, type, orderState, orderNo, startTime, endTime, dateType);

   }

	
	
	
   @Override

   public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, 
         Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException {

		
			
      List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count,keyType, key, state, type, 
            orderState, startTime, endTime);

		
		
      if (list == null) {

         list = new ArrayList<CommonOrderVO>();

      }

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

         return list;

      }

		
      SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");

      for (CommonOrderVO order : list) {

			
         // 下单时间

         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

            order.setDownTime(format.format(thirdCreateTime));

         }

         // 收货时间

         Date settleTime = order.getSettleTime();

         if (settleTime != null) {

            order.setReceiveTime(format.format(settleTime));

         }

			
         // 到账时间

         Date accountTime = order.getAccountTime();

         if (accountTime != null) {

            order.setHongBaoDate(format.format(accountTime));

         }

			
         BigDecimal settlement = order.getSettlement();

         if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {

            order.setPayment(settlement); // 实际付款金额

         }



         /* 订单返利类型 转换 */

         Integer hongBaoType = order.getHongBaoType();

         if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {

            // 自购

            order.setHongBaoType(1);

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            // 分享

            order.setHongBaoType(2);

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

            order.setHongBaoType(3);

         }



         Integer hongBaoState = order.getHongBaoState();

         if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {

            // 未到账

            order.setHongBaoState(1);



         } else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {

            // 已到账

            order.setHongBaoState(2);



         } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {

            // 已失效

            order.setHongBaoState(3);

         }

			
      }

		
      return list;

			
   }



   @Override

   public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,

         String startTime, String endTime) throws CommonOrderException {

      return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime);

   }

	
}