邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

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

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

@@ -29,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;

@@ -114,7 +116,7 @@
      }



      // 数据加工重新组织

      listDataFactory(listOrder, listGoods);

      listDataFactory(listOrder, listGoods, uid);



      return listOrder;

   }

@@ -133,6 +135,12 @@
   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

   public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,

@@ -140,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) {

@@ -169,6 +177,11 @@
                  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

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

@@ -231,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) {

@@ -448,7 +473,176 @@


   @Override

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

   }

	
}