动态v2兼容

yujian

2019-07-31 f4548a3ee46afe45da4ee2a42dc169c575deee9f

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

@@ -31,6 +31,7 @@
import com.yeshi.fanli.entity.order.CommonOrder;

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

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

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

import com.yeshi.fanli.entity.pdd.PDDOrder;

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

@@ -45,12 +46,12 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

@@ -99,6 +100,9 @@


   @Resource

   private CommonGoodsService commonGoodsService;



   @Resource

   private HongBaoOrderService hongBaoOrderService;



   // 奖励订单图片

   public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";

@@ -209,17 +213,39 @@


   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;

@@ -227,7 +253,6 @@


         String orderNo1 = commonOrder.getOrderNo();

         Integer sourceType = commonOrder.getSourceType();



         for (CommonOrderVO order : listOrder) {

            String orderNo2 = order.getOrderNo();

            Integer sourceType2 = order.getSourceType();

@@ -244,6 +269,8 @@
                  e.printStackTrace();

               }



               commonGoodsVO.setGoodsType(sourceType2);

					
               String picture = commonGoodsVO.getPicture();

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

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

@@ -271,9 +298,7 @@
               }

               // 实付款

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



               listOrderGoods.add(commonGoodsVO);



					
               Integer orderType = order.getOrderType();

               if (orderType == null) {

                  String shopType = commonGoodsVO.getShopType();

@@ -282,14 +307,8 @@
                  } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {

                     order.setOrderType(2);

                  } 

						
                  if (Constant.SOURCE_TYPE_JD == sourceType2) {

                     order.setOrderType(3);

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

                     order.setOrderType(4);

                  }

               }



               listOrderGoods.add(commonGoodsVO);

               break;

            }

         }

@@ -313,6 +332,18 @@
         Date settleTime = order.getSettleTime();

         if (settleTime != null) {

            order.setReceiveTime("收货时间：" + format.format(settleTime));

         }

			
         Integer sourceType2 = order.getSourceType();

         if (sourceType2 == Constant.SOURCE_TYPE_TAOBAO) {

            Integer orderType = order.getOrderType();

            if (orderType == null) {

                order.setOrderType(1);

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

             order.setOrderType(3);

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

             order.setOrderType(4);

         }



         /* 订单状态 转换处理 */

@@ -345,30 +376,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);

@@ -465,116 +499,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);

      }

   }



@@ -778,8 +843,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)// 新增

      {

@@ -790,8 +861,9 @@
               commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));

         return commonOrder;

      } else {// 修改

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

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

         // 已经结算，已经失效，状态未改变的订单不处理

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

               || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {

            return oldCommonOrder;

         }

         // 交易ID一致才修改

@@ -903,10 +975,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>();

@@ -915,7 +987,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) {



@@ -992,7 +1095,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;

@@ -1001,16 +1155,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 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;

@@ -1035,13 +1193,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();



@@ -1135,8 +1293,48 @@


   @Override

   public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {



      return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);

   }



   @Transactional

   @Override

   public void deleteErrorCommonOrder(Long coId) {

      // 查询是否返利到账

      HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(coId);

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

         return;

      List<HongBaoV2> hongBaoList = hongBaoV2Service.listChildrenById(hongBaoOrder.getHongBaoV2().getId());

      boolean canDelete = true;

      for (HongBaoV2 child : hongBaoList)

         if (child.getState() == HongBaoV2.STATE_YILINGQU) {

            canDelete = false;

            break;

         }

      // 不能删除

      if (!canDelete)

         return;



      // 删除child

      for (HongBaoV2 child : hongBaoList)

         hongBaoV2Service.deleteByPrimaryKey(child.getId());

      // 删除主红包

      hongBaoV2Service.deleteByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());

      // 删除hongbaoOrder

      hongBaoOrderService.deleteByPrimaryKey(hongBaoOrder.getId());

      // 删除CommonOrder

      commonOrderMapper.deleteByPrimaryKey(hongBaoOrder.getCommonOrder().getId());

   }



   @Override

   public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId) {

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

   }



}