京东兼容

yujian

2019-07-25 0cc3b905e5945d1b4b02ee5f91a615bcfd8f08d6

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

@@ -20,6 +20,7 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper;

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

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

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

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

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

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

@@ -143,26 +144,26 @@


   @Override

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

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

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

         throws CommonOrderException {

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

            dateType);

            dateType, source);

   }



   @Override

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

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

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

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

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

   }



   @Override

   public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, Integer orderState,

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

   public List<CommonOrderVO> getOrderByUid(AcceptData acceptData,Integer page, Long uid, Integer state, Integer type, Integer orderState,

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



      int pageSize = Constant.PAGE_SIZE;



      List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid, state, type,

            orderState, orderNo, startTime, endTime, dateType);

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



      // 订单信息为空

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

@@ -178,24 +179,24 @@
      }



      // 数据加工重新组织

      listDataFactory(listOrder, listGoods, uid);

      listDataFactory(acceptData, listOrder, listGoods, uid);



      return listOrder;

   }



   @Override

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

      return commonOrderMapper.countHistoryOrder(uid, day);

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

      return commonOrderMapper.countHistoryOrder(uid, day, source);

   }



   @Override

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

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

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

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

   }



   @Override

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

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

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

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

   }



   @Override

@@ -206,23 +207,45 @@


   @Override

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

         Integer day) {

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

         Integer day, Integer source) {

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

   }



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

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



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

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

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

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

      for (CommonOrderVO commonOrderVO : listOrder) {

         listNo.add(commonOrderVO.getOrderNo());

         Integer sourceType = commonOrderVO.getSourceType();

         if (sourceType == null) {

            continue;

         } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

            listTB.add(commonOrderVO.getOrderNo());

         } else if (sourceType == Constant.SOURCE_TYPE_JD) {

            listJD.add(commonOrderVO.getOrderNo());

         } else if (sourceType == Constant.SOURCE_TYPE_PDD) {

            listPDD.add(commonOrderVO.getOrderNo());

         }

      }



      // 已经使用券订单

      List<UserSystemCouponRecord> couponRecordList = userSystemCouponRecordService.getRecordByOrderNoList(listNo);



      List<UserSystemCouponRecord> listRecordTB = null;

      if (listTB.size() > 0) {

         listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);

      }

		
       List<UserSystemCouponRecord> listRecordJD = null;

      if (listJD.size() > 0) {

         listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);

      }

		
      List<UserSystemCouponRecord> listRecordPDD = null;

      if (listPDD.size() > 0) {

         listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);

      }

		
      /* 组合商品信息 */

      for (CommonOrderVO commonOrder : listGoods) {



         CommonOrderGoods goods = commonOrder.getCommonOrderGoods();

         if (goods == null) {

            continue;

@@ -230,7 +253,6 @@


         String orderNo1 = commonOrder.getOrderNo();

         Integer sourceType = commonOrder.getSourceType();



         for (CommonOrderVO order : listOrder) {

            String orderNo2 = order.getOrderNo();

            Integer sourceType2 = order.getSourceType();

@@ -277,13 +299,19 @@


               listOrderGoods.add(commonGoodsVO);



               Integer orderType = commonOrder.getOrderType();

               Integer orderType = order.getOrderType();

               if (orderType == null) {

                  String shopType = commonGoodsVO.getShopType();

                  if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {

                     commonOrder.setOrderType(1);

                     order.setOrderType(1);

                  } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {

                     commonOrder.setOrderType(2);

                     order.setOrderType(2);

                  } 
						
                  if (Constant.SOURCE_TYPE_JD == sourceType2) {

                     order.setOrderType(3);

                  } else if (Constant.SOURCE_TYPE_PDD == sourceType2) {

                     order.setOrderType(4);

                  }

               }



@@ -342,30 +370,33 @@
         } else if (CommonOrder.STATE_WQ == orderState) {

            orderStateContent = "已维权";



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

            List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

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

            Integer sourceType = order.getSourceType();

            if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {

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

               List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

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



            boolean isPart = false;// 默认失效

               boolean isPart = false;// 默认失效



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

               BigDecimal fanTotalMoney = new BigDecimal(0);

               for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {

                  BigDecimal fanMoney = weiQuanOrder.getFanMoney();

                  if (fanMoney != null) {

                     fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);

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

                  BigDecimal fanTotalMoney = new BigDecimal(0);

                  for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {

                     BigDecimal fanMoney = weiQuanOrder.getFanMoney();

                     if (fanMoney != null) {

                        fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);

                     }

                  }



                  if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {

                     isPart = true;

                  }

               }



               if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {

                  isPart = true;

               if (isPart) {

                  hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 部分失效

               } else {

                  hongBaoState = HongBaoV2.STATE_SHIXIAO; // 全部失效

               }

            }



            if (isPart) {

               hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 部分失效

            } else {

               hongBaoState = HongBaoV2.STATE_SHIXIAO; // 全部失效

            }

         }

         orderStateMap.put("content", orderStateContent);

@@ -462,116 +493,147 @@


         // 非自购的订单 不显示返利、免单详情

         if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {

            // 订单标识

            order.setSignList(signList);



         } else {



            // 是否免单商品

            boolean freeOrder = false;

            // 是否奖励成功

            boolean rewardSuccess = false;



            Integer sourceType = order.getSourceType();

            // 奖励订单、免单 使用记录

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



               for (UserSystemCouponRecord couponRecord : couponRecordList) {

                  // 订单号匹配

                  if (order.getOrderNo().equals(couponRecord.getOrderNo())) {



                     String systemCouponType = couponRecord.getCouponType();

                     Integer state = couponRecord.getState();



                     // 奖励订单: 且成功

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

                           && UserSystemCouponRecord.STATE_SUCCESS == state) {

                        rewardSuccess = true;

                        signList.add(PIC_REWARD); // 加入奖励成功图片



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

                           || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {



                        if (UserSystemCouponRecord.STATE_FREE_ON == state) {

                           // 免单中

                           freeOrder = true;

                           signList.add(PIC_FREE_ON);

                        } else if (UserSystemCouponRecord.STATE_SUCCESS == state) {

                           // 免单成功

                           freeOrder = true;

                           signList.add(PIC_FREE_SUCCEED);

                        } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state

                              || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {

                           // 规则不匹配、退款

                           freeOrder = true;

                           signList.add(PIC_FREE_FAIL);

                        }

                     }



                     break;

                  }

               }

            }



            // 订单标识

            order.setSignList(signList);



            boolean rewardOrder = false;



            int type = 1; // 1 常规跳转页面 2弹出选项（奖励券）

            if (rewardSuccess) {

               // 奖励成功

               rewardOrder = true;

            } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType

                  && HongBaoV2.STATE_YILINGQU == hongBaoState) {

               // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单

               type = 2;

               rewardOrder = true;

            }



            if (rewardOrder) {

               ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

               // 奖励券进度详情

               rewardStyleVO.setContent("返利奖励 >");

               rewardStyleVO.setColor("#E5005C");

               rewardStyleVO.setBottomColor("#FFDCEA");



               Map<String, Object> jumpLink = new HashMap<String, Object>();

               jumpLink.put("orderNo", order.getOrderNo());



               Map<String, Object> jump = new HashMap<String, Object>();

               jump.put("type", type);

               jump.put("params", jumpLink);

               jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));



               Map<String, Object> rewardMap = new HashMap<String, Object>();

               rewardMap.put("text", rewardStyleVO);

               rewardMap.put("jump", jump);



               order.setRewardDetail(rewardMap);

            }



            if (freeOrder) {

               ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

               // 返利、免单详情

               rewardStyleVO.setContent("免单详情 >");

               rewardStyleVO.setColor("#E5005C");

               rewardStyleVO.setBottomColor("#FFDCEA");



               Map<String, Object> jumpLink = new HashMap<String, Object>();

               jumpLink.put("orderNo", order.getOrderNo());



               Map<String, Object> jump = new HashMap<String, Object>();

               jump.put("type", 1); // 页面跳转

               jump.put("params", jumpLink);

               jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));



               Map<String, Object> rewardMap = new HashMap<String, Object>();

               rewardMap.put("text", rewardStyleVO);

               rewardMap.put("jump", jump);



               order.setRewardDetail(rewardMap);

            if (sourceType == null) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList);

            } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList);

            } else if (sourceType == Constant.SOURCE_TYPE_JD) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList);

            } else if (sourceType == Constant.SOURCE_TYPE_PDD) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);

            }

         }

			
         // 邀请 隐藏订单号

         if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

             String orderNo = order.getOrderNo();

             orderNo = orderNo.substring(0, orderNo.length()-6);

             order.setOrderNo(orderNo + "******");

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

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

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

             String orderNo = order.getOrderNo();

             orderNo = orderNo.substring(0, orderNo.length()-6);

             order.setOrderNo(orderNo + "******");

         }

      }

   }

	
	
   /**

    * 订单： 免单标识  奖励标识

    * @param order

    * @param hasRewardCoupon

    * @param hongBaoState

    * @param list

    * @param signList

    */

   public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,

         List<UserSystemCouponRecord> list, List<String> signList) {



      // 是否免单商品

      boolean freeOrder = false;

      // 是否奖励成功

      boolean rewardSuccess = false;



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

         for (UserSystemCouponRecord couponRecord : list) {

            // 订单号匹配

            if (order.getOrderNo().equals(couponRecord.getOrderNo())) {

               Integer state = couponRecord.getState();

               String systemCouponType = couponRecord.getCouponType();

               // 奖励订单: 且成功

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

                     && UserSystemCouponRecord.STATE_SUCCESS == state) {

                  rewardSuccess = true;

                  signList.add(PIC_REWARD); // 加入奖励成功图片



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

                     || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {



                  if (UserSystemCouponRecord.STATE_FREE_ON == state) {

                     // 免单中

                     freeOrder = true;

                     signList.add(PIC_FREE_ON);

                  } else if (UserSystemCouponRecord.STATE_SUCCESS == state) {

                     // 免单成功

                     freeOrder = true;

                     signList.add(PIC_FREE_SUCCEED);

                  } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state

                        || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {

                     // 规则不匹配、退款

                     freeOrder = true;

                     signList.add(PIC_FREE_FAIL);

                  }

               }



               break;

            }

         }

      }



      // 订单标识

      order.setSignList(signList);



      boolean rewardOrder = false;



      int type = 1; // 1 常规跳转页面 2弹出选项（奖励券）

      if (rewardSuccess) {

         // 奖励成功

         rewardOrder = true;

      } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType

            && HongBaoV2.STATE_YILINGQU == hongBaoState) {

         // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单

         type = 2;

         rewardOrder = true;

      }



      if (rewardOrder) {

         ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

         // 奖励券进度详情

         rewardStyleVO.setContent("返利奖励 >");

         rewardStyleVO.setColor("#E5005C");

         rewardStyleVO.setBottomColor("#FFDCEA");



         Map<String, Object> jumpLink = new HashMap<String, Object>();

         jumpLink.put("orderNo", order.getOrderNo());



         Map<String, Object> jump = new HashMap<String, Object>();

         jump.put("type", type);

         jump.put("params", jumpLink);

         jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));



         Map<String, Object> rewardMap = new HashMap<String, Object>();

         rewardMap.put("text", rewardStyleVO);

         rewardMap.put("jump", jump);



         order.setRewardDetail(rewardMap);

      }



      if (freeOrder) {

         ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

         // 返利、免单详情

         rewardStyleVO.setContent("免单详情 >");

         rewardStyleVO.setColor("#E5005C");

         rewardStyleVO.setBottomColor("#FFDCEA");



         Map<String, Object> jumpLink = new HashMap<String, Object>();

         jumpLink.put("orderNo", order.getOrderNo());



         Map<String, Object> jump = new HashMap<String, Object>();

         jump.put("type", 1); // 页面跳转

         jump.put("params", jumpLink);

         jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));



         Map<String, Object> rewardMap = new HashMap<String, Object>();

         rewardMap.put("text", rewardStyleVO);

         rewardMap.put("jump", jump);



         order.setRewardDetail(rewardMap);

      }

   }



@@ -775,8 +837,14 @@
         commonOrder.setCommonOrderGoods(goods);

      }



      CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),

            commonOrder.getSourceType(), commonOrder.getOrderBy());

      CommonOrder oldCommonOrder = null;



      if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))

         oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),

               commonOrder.getTradeId());

      else

         oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),

               commonOrder.getSourceType(), commonOrder.getOrderBy());



      if (oldCommonOrder == null)// 新增

      {

@@ -901,10 +969,10 @@


   @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 {

         Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException {



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

            startTime, endTime);

            startTime, endTime, source);



      if (list == null) {

         list = new ArrayList<CommonOrderVO>();

@@ -913,7 +981,38 @@
      if (list.size() == 0) {

         return list;

      }

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

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

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

      for (CommonOrderVO commonOrderVO : list) {

         Integer sourceType = commonOrderVO.getSourceType();

         if (sourceType == null) {

            continue;

         } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

            listTB.add(commonOrderVO.getOrderNo());

         } else if (sourceType == Constant.SOURCE_TYPE_JD) {

            listJD.add(commonOrderVO.getOrderNo());

         } else if (sourceType == Constant.SOURCE_TYPE_PDD) {

            listPDD.add(commonOrderVO.getOrderNo());

         }

      }



      List<UserSystemCouponRecord> listRecordTB = null;

      if (listTB.size() > 0) {

         listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);

      }

		
       List<UserSystemCouponRecord> listRecordJD = null;

      if (listJD.size() > 0) {

         listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);

      }

		
      List<UserSystemCouponRecord> listRecordPDD = null;

      if (listPDD.size() > 0) {

         listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);

      }

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

      for (CommonOrderVO order : list) {



@@ -990,7 +1089,58 @@
               }

            }

         }



			
			
         Integer sourceType = order.getSourceType();

         // 奖励订单、免单 使用记录

         if (sourceType == null) {

			
         } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO && listRecordTB != null && listRecordTB.size() > 0) {

            for (UserSystemCouponRecord couponRecord : listRecordTB) {

               if (order.getOrderNo().equals(couponRecord.getOrderNo())) {

                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                  }

                  break;

               }

            }

         } else if (sourceType == Constant.SOURCE_TYPE_JD && listRecordJD != null && listRecordJD.size() > 0) {

            for (UserSystemCouponRecord couponRecord : listRecordJD) {

               if (order.getOrderNo().equals(couponRecord.getOrderNo())) {

                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                  }

                  break;

               }

            }

         } else if (sourceType == Constant.SOURCE_TYPE_PDD && listRecordPDD != null && listRecordPDD.size() > 0) {

            for (UserSystemCouponRecord couponRecord : listRecordPDD) {

               if (order.getOrderNo().equals(couponRecord.getOrderNo())) {

                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                  }

                  break;

               }

            }

         }

      }



      return list;

@@ -999,25 +1149,20 @@


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

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

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

   }



   @Override

   public CommonOrderVO getInfoByOrderNo(Long uid, String orderNo) throws CommonOrderException {

      List<CommonOrderVO> list = getOrderByUid(1, uid, null, null, null, orderNo, null, null, null);

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

         return null;

      } else {

         return list.get(0);

      }

   }



   @Override

   public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)

   public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)

         throws CommonOrderException {



      CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);

      if (sourceType == null) {

         sourceType = Constant.SOURCE_TYPE_TAOBAO;

      }

		
      CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);

      // 订单信息为空

      if (commonOrderVO == null) {

         return null;

@@ -1042,13 +1187,13 @@
         }



         String orderNo1 = commonOrder.getOrderNo();

         Integer sourceType = commonOrder.getSourceType();

         Integer sourceType1 = commonOrder.getSourceType();



         String orderNo2 = commonOrderVO.getOrderNo();

         Integer sourceType2 = commonOrderVO.getSourceType();



         // 来源、订单号相同

         if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {

         if (sourceType1.equals(sourceType2) && orderNo1.equals(orderNo2)) {

            // 加入商品信息

            List<CommonOrderGoodsVO> listOrderGoods = commonOrderVO.getListOrderGoods();



@@ -1106,30 +1251,6 @@
      return commonOrderVO;

   }



   @Override

   public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer hongBaoState, String orderNo)

         throws CommonOrderException {



      List<CommonOrderVO> listOrder = commonOrderMapper.getCouponHongbaoByOrderNo(uid, hongBaoState, orderNo);



      // 订单信息为空

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

         listOrder = new ArrayList<CommonOrderVO>();

         return listOrder;

      }



      // 商品信息

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

      // 订单商品为空

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

         return listOrder;

      }



      // 数据加工重新组织

      listDataFactory(listOrder, listGoods, uid);



      return listOrder;

   }



   @Override

   public JSONObject getRewardJumpInfo(String orderNo) {

@@ -1166,7 +1287,6 @@


   @Override

   public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {



      return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);

   }



@@ -1204,4 +1324,11 @@
      return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId);

   }



   @Override

   public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,

         Long maxTime, int page, int pageSize) {

      return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

            (page - 1) * pageSize, pageSize);

   }



}