订单补偿 + 奖励券使用倒计时

yujian

2019-10-21 d085ca89e39b4cda025a9a53d3797fbe8b242ae7

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

@@ -14,12 +14,15 @@
import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.DateUtil;

import org.yeshi.utils.entity.DateInfo;

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.order.CommonOrderTradeIdMapMapper;

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

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

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

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

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

@@ -33,6 +36,7 @@
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.order.OrderSubsidy;

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

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

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

@@ -45,9 +49,10 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemCouponService;

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.order.HongBaoV2Service;

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -109,6 +114,10 @@


   @Resource

   private HongBaoOrderService hongBaoOrderService;

	
   @Resource

   private OrderSubsidyService orderSubsidyService;

	


   // 奖励订单图片

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

@@ -216,9 +225,35 @@
   }



   @Override

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

         Integer day, Integer source) {

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

   public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,

         Integer day, Integer source, Integer state, Integer stateOrder) {

      return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);

   }



   private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {

      BigDecimal weiQuanMoney = new BigDecimal(0);

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

         for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {

            String tradeId = weiQuanOrder.getOrderItemId();

            // 查询红包

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

            tradeList.add(tradeId);

            List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,

                  tradeList);

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

               CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);

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

                  BigDecimal wqMoney = MoneyBigDecimalUtil

                        .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())

                        .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);

                  if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)

                     wqMoney = hongBaoList.get(0).getMoney();

                  weiQuanMoney = weiQuanMoney.add(wqMoney);

               }

            }

         }

      }

      return weiQuanMoney;

   }



   public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,

@@ -329,7 +364,8 @@
      SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");



      // 是否存在奖励券

      //boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

      // boolean hasRewardCoupon =

      // userSystemCouponService.hasRewardCoupon(uid);

      boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);

      boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);



@@ -409,21 +445,7 @@
                     .selectListByOrderIdAndState(order.getOrderNo(), "维权成功");



               boolean isPart = false;// 默认失效

               BigDecimal weiQuanMoney = new BigDecimal(0);

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

                     }

                     weiQuanMoney = MoneyBigDecimalUtil.add(weiQuanOrder.getMoney(), weiQuanMoney);

                  }



                  if (fanTotalMoney.compareTo(hongBao) < 0) {

                     isPart = true;

                  }

               }

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



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

                  if (isPart) {

@@ -437,19 +459,17 @@
                     orderStateContent = "维权成功";

                     WeiQuanInfo weiQuanInfo = new WeiQuanInfo();

                     weiQuanInfo.setOldHongBao("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                     if (isPart) {

                        // 维权失效金额=维权的金额*获得的红包/结算金额

                        BigDecimal settlement = order.getSettlement();

                        BigDecimal wqHongbao = MoneyBigDecimalUtil

                              .div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);

                        weiQuanInfo.setWqHongBao(

                              "维权：-¥" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        hongBao = MoneyBigDecimalUtil.sub(hongBao, wqHongbao);

                     } else {

                        weiQuanInfo

                              .setWqHongBao("维权：-¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        hongBao = new BigDecimal(0);

                     }

                     // if (isPart) {

                     weiQuanInfo

                           .setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

                     hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);

                     // } else {

                     // weiQuanInfo

                     // .setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2,

                     // BigDecimal.ROUND_DOWN).toString());

                     // hongBao = MoneyBigDecimalUtil.sub(hongBao,

                     // weiQuanMoney);

                     // }

                     order.setWeiQuanInfo(weiQuanInfo);

                  }

               }

@@ -477,14 +497,42 @@
            order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);

            signList.add(CommonOrder.TYPE_SHARE);



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

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

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

         } else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 下级的分享订单：  显示邀请

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");

            order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);

            signList.add(CommonOrder.TYPE_INVITE);

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

               || HongBaoV2.TYPE_ERJI == hongBaoType) {

            // 邀请订单

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");

            order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);

            signList.add(CommonOrder.TYPE_INVITE);

				
            // 版本区分：2-0-2

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

               OrderSubsidy orderSubsidy = orderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType2);

               if (orderSubsidy != null) {

                  ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();

                  if (orderSubsidy.getState() == OrderSubsidy.STATE_SUBSIDIZED) {

                     subsidyInfo.setColor("#E5005C");

                     subsidyInfo.setContent("已补贴¥" + orderSubsidy.getMoney());

                  } else {

                     subsidyInfo.setColor("#888888");

                     subsidyInfo.setContent("补贴¥" + orderSubsidy.getMoney());

							
                     // 解释信息（问号）

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

                     subsidyList.add("额外补贴能否获得由系统算法自动判断，人为无法干涉；");

                     subsidyList.add("额外补贴到账时间以及金额请以实际到账为准；");

                     subsidyList.add("额外补贴产生后将会在消息-资金消息中提醒你。");

                     order.setSubsidyList(subsidyList);

                  }

                  order.setSubsidy(subsidyInfo);

               }

            }

         }



         String hongBaoDate = null;

@@ -531,6 +579,10 @@
         order.setHongBaoState(orderHongBaoState);

         order.setHongBaoDate(hongBaoDate);



         if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {

            stateContent = stateContent + "-" + order.getStateDesc();

         }

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

         stateMap.put("content", stateContent);

         stateMap.put("fontColor", stateFontColor);

@@ -550,13 +602,17 @@
         } else {

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

            if (sourceType == null) {

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,

                     signList, acceptData);

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

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,

                     listRecordTB, signList, acceptData);

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

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,

                     listRecordJD, signList, acceptData);

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

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,

                     listRecordPDD, signList, acceptData);

            }

         }



@@ -578,11 +634,12 @@
    * @param list

    * @param signList

    */

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

         Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, AcceptData acceptData) {

   public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon,

         Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,

         AcceptData acceptData) {



      // 是否免单商品

      boolean freeOrder = false;

      boolean freeOrder = false;  
      // 是否奖励成功

      boolean rewardSuccess = false;



@@ -629,18 +686,18 @@
      // 1.6.5 是否存在新兑换的券

      if (!hasRewardCoupon && exchangeCoupon) {

         try {

            String downTime = order.getDownTime();

            if (!StringUtil.isNullOrEmpty(downTime)) {

               long downOrderTime = TimeUtil.convertDateToTemp2(downTime);

               long limitDate = TimeUtil.convertDateToTemp("2019-09-01");

               if (downOrderTime > limitDate )

            Date thirdCreateTime = order.getThirdCreateTime();

            if (thirdCreateTime != null) {

               long downOrderTime = thirdCreateTime.getTime();

               long limitDate = TimeUtil.convertDateToTemp("2019-09-10");

               if (downOrderTime > limitDate)

                  hasRewardCoupon = true;

            }

         } catch (Exception e) {

            e.printStackTrace();

         }

      }

		


      boolean rewardOrder = false;



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

@@ -652,31 +709,106 @@
         // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单

         type = 2;

         rewardOrder = true;

      } 
      }



      if (rewardOrder) {

         ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

         // 奖励券进度详情

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

         rewardStyleVO.setColor("#E5005C");

         rewardStyleVO.setBottomColor("#FFDCEA");

         try {

            boolean newEdition = false;

            String num = null;

            String unit = null;

            boolean canUse = false;

				
            // 版本区分：2.0.2

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

               Date thirdCreateTime = order.getThirdCreateTime();

               if (thirdCreateTime != null) {

                  long downOrderTime = thirdCreateTime.getTime();

                  long limitDate = Long.parseLong("1573315200000"); // TODO 日期待确定2019-11-10

                  if (downOrderTime > limitDate) {

                     newEdition = true;

                     Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);

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

                     if (endDay.getTime() > currentTime) {

                        DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());

                        if (dateInfo != null) {

                           if (dateInfo.getDay() > 0) {

                              canUse = true;

                              unit = "天";

                              num = dateInfo.getDay().toString();

                           }



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

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

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

            jumpLink.put("goodsType", order.getSourceType());

                           if (!canUse && dateInfo.getHour() > 0) {

                              canUse = true;

                              unit = "小时";

                              num = dateInfo.getHour().toString();

                           }



                           if (!canUse && dateInfo.getMinute() > 0) {

                              canUse = true;

                              unit = "分";

                              num = dateInfo.getMinute().toString();

                           }



                           if (!canUse && dateInfo.getSecond() > 0) {

                              canUse = true;

                              unit = "秒";

                              num = dateInfo.getSecond().toString();

                           }

                        }

                     }

                  }

               }

            }



            if (newEdition && !canUse) {

               // 新版不可使用

            } else {

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

               ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

               rewardStyleVO.setColor("#E5005C");

               rewardStyleVO.setBottomColor("#FFDCEA");

               if (!newEdition) {

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

               } else if (canUse) {

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

						
                  ClientTextStyleVO txt1 = new ClientTextStyleVO();

                  txt1.setContent("剩");

                  txt1.setColor("#666666");

                  txt1.setBottomColor("#FFDCEA");

						
                  ClientTextStyleVO txt2 = new ClientTextStyleVO();

                  txt2.setContent(num);

                  txt2.setColor("#E5005C");

                  txt2.setBottomColor("#FFDCEA");

						
                  ClientTextStyleVO txt3 = new ClientTextStyleVO();

                  txt3.setContent(unit + "关闭 >");

                  txt3.setColor("#666666");

                  txt3.setBottomColor("#FFDCEA");

						
                  List<ClientTextStyleVO> ticking = new ArrayList<ClientTextStyleVO>();

                  ticking.add(txt1);

                  ticking.add(txt2);

                  ticking.add(txt3);

                  rewardMap.put("ticking", ticking);

               }

               rewardMap.put("text", rewardStyleVO);

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

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

               jumpLink.put("goodsType", order.getSourceType() + "");

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

               jump.put("type", type);

               jump.put("params", jumpLink);

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

               rewardMap.put("jump", jump);

               order.setRewardDetail(rewardMap);

            }

         } catch (Exception e) {

            e.printStackTrace();

         }



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

@@ -689,7 +821,7 @@
         Map<String, Object> jumpLink = new HashMap<String, Object>();

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

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

            jumpLink.put("goodsType", order.getSourceType());

            jumpLink.put("goodsType", order.getSourceType()+"");

         }



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

@@ -712,8 +844,9 @@


   @Transactional

   @Override

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

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

   public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)

         throws CommonOrderException {

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

      // 判断所有的订单状态

      int invalidCount = 0;

      for (TaoBaoOrder tb : taoBaoOrders) {

@@ -773,8 +906,9 @@


   @Transactional

   @Override

   public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException {

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

   public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)

         throws CommonOrderException {

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

      // 判断所有的订单状态

      int invalidCount = 0;

      for (PDDOrder order : pddOrderList) {

@@ -822,8 +956,8 @@


   @Transactional

   @Override

   public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {

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

   public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {

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

      // 判断所有的订单状态

      int invalidCount = 0;

      for (JDOrderItem tb : jdOrder.getOrderItemList()) {

@@ -891,7 +1025,7 @@
    * @param commonOrder

    */

   @Transactional

   private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {

   private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {

      // 判断商品是否存在

      if (commonOrder == null)

         throw new CommonOrderException(1, "订单为空");

@@ -934,13 +1068,13 @@
         // 插入映射，保证交易ID的完整性

         commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),

               commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));

         return commonOrder;

         return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);

      } else {// 修改

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

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

               || oldCommonOrder.getState() == CommonOrder.STATE_WQ

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

            return oldCommonOrder;

            return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);

         }

         // 交易ID一致才修改

         if (commonOrder.getTradeId() != null

@@ -956,9 +1090,10 @@
            updateCommonOrder.setUpdateTime(new Date());

            updateCommonOrder.setTradeId(commonOrder.getTradeId());

            commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

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

            return new CommonOrderAddResultDTO(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()),

                  CommonOrderAddResultDTO.TYPE_UPDATE);

         } else

            return oldCommonOrder;

            return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);

      }

   }



@@ -1352,7 +1487,7 @@
   }



   @Override

   public JSONObject getRewardJumpInfo(String orderNo) {

   public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {



      JSONObject map = new JSONObject();

      // 订单标识

@@ -1369,6 +1504,7 @@


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

      jumpLink.put("orderNo", orderNo);

      jumpLink.put("goodsType", goodsType == null? goodsType: goodsType +"");



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

      jump.put("type", 1);

@@ -1429,10 +1565,21 @@
      return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

            (page - 1) * pageSize, pageSize);

   }

	


   @Override

   public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {

      return commonOrderMapper.getByOrderNo(uid, orderNO);

   }



   @Override

   public CommonOrder selectLatestValidByUid(Long uid) {

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

      stateList.add(CommonOrder.STATE_FK);

      stateList.add(CommonOrder.STATE_JS);

      List<CommonOrder> commonOrderList = commonOrderMapper.listByUid(uid, stateList, 0, 1);

      if (commonOrderList == null || commonOrderList.size() == 0)

         return null;

      return commonOrderList.get(0);

   }



}