RocketMQ的消息整改

admin

2019-11-20 8b2191df2f7d94aa299bd43dcbe97c94e5a61bbd

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

@@ -1,7 +1,6 @@
package com.yeshi.fanli.service.impl.order;



import java.math.BigDecimal;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

@@ -14,12 +13,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 +35,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.InviteOrderSubsidy;

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

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

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

@@ -45,9 +48,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.InviteOrderSubsidyService;

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

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

import com.yeshi.fanli.util.Constant;

@@ -109,6 +113,10 @@


   @Resource

   private HongBaoOrderService hongBaoOrderService;

	
   @Resource

   private InviteOrderSubsidyService inviteOrderSubsidyService;

	


   // 奖励订单图片

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

@@ -166,7 +174,7 @@
   @Override

   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 {

         throws CommonOrderException, Exception{



      int pageSize = Constant.PAGE_SIZE;



@@ -187,399 +195,12 @@
      }



      // 数据加工重新组织

      listDataFactory(acceptData, listOrder, listGoods, uid);



      orderInfoFactory(acceptData, listOrder, listGoods, uid);

      //listDataFactory(acceptData, listOrder, listGoods, uid);

      return listOrder;

   }



   @Override

   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,

         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,

         Integer source) {

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

   }



   @Override

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

         String endTime, Integer source) {

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

   }



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

   }



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

                  weiQuanMoney = weiQuanMoney.add(wqMoney);

               }

            }

         }

      }

      return weiQuanMoney;

   }



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

         Long uid) {



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

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

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

      for (CommonOrderVO commonOrderVO : listOrder) {

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

      }



      /* 组合商品信息 */

      for (CommonOrderVO commonOrder : listGoods) {

         CommonOrderGoods goods = commonOrder.getCommonOrderGoods();

         if (goods == null) {

            continue;

         }



         String orderNo1 = commonOrder.getOrderNo();

         Integer sourceType = commonOrder.getSourceType();

         for (CommonOrderVO order : listOrder) {

            String orderNo2 = order.getOrderNo();

            Integer sourceType2 = order.getSourceType();



            // 来源、订单号相同

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

               // 加入商品信息

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



               CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();

               try {

                  PropertyUtils.copyProperties(commonGoodsVO, goods);

               } catch (Exception e) {

                  e.printStackTrace();

               }



               commonGoodsVO.setGoodsType(sourceType2);



               String picture = commonGoodsVO.getPicture();

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

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

               }



               Integer hongBaoType = order.getHongBaoType();

               // 邀请订单信息保护

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

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

                     || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

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

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

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

                  titleMap.put("bottomColor", "#E9E9E9");

                  commonGoodsVO.setTitle(null);

                  commonGoodsVO.setGoodsTitle(titleMap);

               }



               // 购买数量

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



               BigDecimal totalSettlement = commonOrder.getTotalSettlement();

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

                  totalSettlement = commonOrder.getTotalPayment();

               }

               // 实付款

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



               Integer orderType = order.getOrderType();

               if (orderType == null) {

                  String shopType = commonGoodsVO.getShopType();

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

                     order.setOrderType(1);

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

                     order.setOrderType(2);

                  }

               }

               listOrderGoods.add(commonGoodsVO);

               break;

            }

         }

      }



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

      SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");



      // 是否存在奖励券

      // boolean hasRewardCoupon =

      // userSystemCouponService.hasRewardCoupon(uid);

      boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);

      boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);



      // 2019.8.1开始返回维权信息

      Date august = null;

      try {

         august = TimeUtil.parse("2019-08-01");

      } catch (ParseException e) {

         e.printStackTrace();

      }



      /* 组织订单状态 等信息 */

      for (CommonOrderVO order : listOrder) {



         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

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

            order.setObtainTime(thirdCreateTime.getTime());

         }



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

         }



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

         String orderStateContent = "";

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



         // 订单状态

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

            }

         }



         BigDecimal hongBao = order.getHongBao();

         if (hongBao == null) {

            hongBao = new BigDecimal(0);

         }



         if (CommonOrder.STATE_FK == orderState) {

            orderStateContent = "已付款";

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

            orderStateContent = "已收货";

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

            orderStateContent = "未付款/已退款";

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

            orderStateContent = "已维权";



            Integer sourceType = order.getSourceType();

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

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

               List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

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



               boolean isPart = false;// 默认失效

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



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

                  if (isPart) {

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

                  } else {

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

                  }

               } else {

                  // 2019.8.1 返回维权信息

                  if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {

                     orderStateContent = "维权成功";

                     WeiQuanInfo weiQuanInfo = new WeiQuanInfo();

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

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

                  }

               }

            }

         }

         orderStateMap.put("content", orderStateContent);

         orderStateMap.put("fontColor", "#666666");

         order.setOrderState(orderStateMap);



         String hongbaoInfo = "";

         // 订单标识

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

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

         Integer hongBaoType = order.getHongBaoType();

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

            // 自购

            hongbaoInfo = "返利";

            order.setOrderOrigin("1");

            order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);

            signList.add(CommonOrder.TYPE_FANLI);

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

            // 分享

            hongbaoInfo = "奖金";

            order.setOrderOrigin("2");

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

            // 邀请

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");

            order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);

            signList.add(CommonOrder.TYPE_INVITE);

         }



         String hongBaoDate = null;

         String hongBaoState_Str = "";

         String hongbaoInfoFontColor = "#E5005C";



         /* 红包状态 转换 */

         String stateContent = "";

         String stateFontColor = "#E5005C";

         Integer orderHongBaoState = null;



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

            orderHongBaoState = 1;

            stateContent = "未到账";

            hongBaoState_Str = "预估";



            Date preAccountTime = order.getPreAccountTime();

            if (preAccountTime != null) {

               hongBaoDate = "预计到账时间：" + formatday.format(preAccountTime);

            }



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

            orderHongBaoState = 3;

            stateContent = "已到账";



            Date accountTime = order.getAccountTime();

            if (accountTime != null) {

               hongBaoDate = "到账时间：" + formatday.format(accountTime);

            }



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

            stateContent = "部分失效";

            orderHongBaoState = 3;

            Date accountTime = order.getAccountTime();

            if (accountTime != null) {

               hongBaoDate = "到账时间：" + formatday.format(accountTime);

            }



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

            orderHongBaoState = 4;

            stateContent = "已失效";

            hongbaoInfoFontColor = "#888888";

         }

         order.setHongBaoState(orderHongBaoState);

         order.setHongBaoDate(hongBaoDate);



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

         stateMap.put("content", stateContent);

         stateMap.put("fontColor", stateFontColor);

         order.setAccountState(stateMap);



         hongbaoInfo = hongBaoState_Str + hongbaoInfo;



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

         hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

         hongBaoMap.put("fontColor", hongbaoInfoFontColor);

         order.setHongBaoInfo(hongBaoMap);



         Integer sourceType = order.getSourceType();

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

         if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {

            order.setSignList(signList);

         } else {

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

            if (sourceType == null) {

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

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

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

            }

         }



         // 分享、邀请 隐藏订单号

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

               || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));

         }

      }

   }



	
   /**

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

    * 

@@ -594,7 +215,7 @@
         AcceptData acceptData) {



      // 是否免单商品

      boolean freeOrder = false;

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

      boolean rewardSuccess = false;



@@ -641,10 +262,10 @@
      // 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-05");

            Date thirdCreateTime = order.getThirdCreateTime();

            if (thirdCreateTime != null) {

               long downOrderTime = thirdCreateTime.getTime();

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

               if (downOrderTime > limitDate)

                  hasRewardCoupon = true;

            }

@@ -654,11 +275,11 @@
      }



      boolean rewardOrder = false;



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

      if (rewardSuccess) {

         // 奖励成功

         rewardOrder = true;

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

            rewardOrder = true; //奖励成功 2.0.2 消失

         }

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

            && HongBaoV2.STATE_YILINGQU == hongBaoState) {

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

@@ -667,28 +288,108 @@
      }



      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.1

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

               Date thirdCreateTime = order.getThirdCreateTime();

               if (thirdCreateTime != null) {

                  long downOrderTime = thirdCreateTime.getTime();

                  long limitDate = Long.parseLong("1571760000000"); // 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) {

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

                     rewardStyleVO.setContent("使用奖励券 >");

                  } else {

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

                  txt2.setFontSize("1.33");

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

@@ -701,7 +402,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>();

@@ -717,6 +418,416 @@
      }

   }



	
	
   /**

    * 订单信息加工

    * @param acceptData

    * @param listOrder

    * @param listGoods

    * @param uid

    */

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

         Long uid) throws Exception{

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

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

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

      for (CommonOrderVO commonOrderVO : listOrder) {

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

      SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");

      // 2019.8.1开始返回维权信息

      Date august = TimeUtil.parse("2019-08-01");

				
      // 是否存在奖励券

      boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);

      boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);



		
      for (CommonOrderVO order: listOrder) {

         String orderNo = order.getOrderNo();

         Integer sourceType = order.getSourceType();

			
         // 商品信息组合

         for (CommonOrderVO commonOrder: listGoods) {

            CommonOrderGoods goods = commonOrder.getCommonOrderGoods();

            if (goods == null) {

               continue;

            }

				
            if (sourceType.equals(commonOrder.getSourceType()) && orderNo.equals(commonOrder.getOrderNo())) {

               CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();

               PropertyUtils.copyProperties(commonGoodsVO, goods);

               commonGoodsVO.setGoodsType(sourceType);

				
               // 淘宝商品图片处理

               String picture = commonGoodsVO.getPicture();

               if (sourceType == Constant.SOURCE_TYPE_TAOBAO && !StringUtil.isNullOrEmpty(picture) 
                     && !picture.contains("320x320")) {

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

               }

					
               // 购买数量

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

					
               // 实付款

               BigDecimal totalSettlement = commonOrder.getTotalSettlement();

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

                  totalSettlement = commonOrder.getTotalPayment();

               }

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

					
					
               Integer hongBaoType = order.getHongBaoType();

               // 邀请订单信息保护

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

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

                     || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

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

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

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

                  titleMap.put("bottomColor", "#E9E9E9");

                  commonGoodsVO.setTitle(null);

                  commonGoodsVO.setGoodsTitle(titleMap);

               }





               // 订单类型为空时 已商品类为准

               Integer orderType = order.getOrderType();

               if (orderType == null) {

                  String shopType = commonGoodsVO.getShopType();

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

                     order.setOrderType(1);

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

                     order.setOrderType(2);

                  }

               }

					
               order.getListOrderGoods().add(commonGoodsVO);

            }

         }

			
			
         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

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

            order.setObtainTime(thirdCreateTime.getTime());

         }



         Date settleTime = order.getSettleTime();

         if (settleTime != null) {

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

         }

			
         // 订单类型

         if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

            Integer orderType = order.getOrderType();

            if (orderType == null)

               order.setOrderType(1);

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

            order.setOrderType(3);

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

            order.setOrderType(4);

         }

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

         String orderStateContent = "";

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

         // 订单状态

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

            }

         }



         BigDecimal hongBao = order.getHongBao();

         if (hongBao == null) {

            hongBao = new BigDecimal(0);

         }



         if (CommonOrder.STATE_FK == orderState) {

            orderStateContent = "已付款";

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

            orderStateContent = "已收货";

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

            orderStateContent = "未付款/已退款";

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

            orderStateContent = "已维权";

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

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

               List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

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



               boolean isPart = false;// 默认失效

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



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

                  if (isPart) {

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

                  } else {

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

                  }

               } else {

                  // 2019.8.1 返回维权信息

                  if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {

                     orderStateContent = "维权成功";

                     WeiQuanInfo weiQuanInfo = new WeiQuanInfo();

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

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

                     hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);

                     order.setWeiQuanInfo(weiQuanInfo);

                  }

               }

            }

         }

         orderStateMap.put("content", orderStateContent);

         orderStateMap.put("fontColor", "#666666");

         order.setOrderState(orderStateMap);

			
			
			
			
         String hongbaoInfo = "";

         // 订单标识

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

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

         Integer hongBaoType = order.getHongBaoType();

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

            // 自购

            hongbaoInfo = "返利";

            order.setOrderOrigin("1");

            order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);

            signList.add(CommonOrder.TYPE_FANLI);

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

            // 分享

            hongbaoInfo = "奖金";

            order.setOrderOrigin("2");

            order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);

            signList.add(CommonOrder.TYPE_SHARE);



         } 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_1(acceptData.getPlatform(), acceptData.getVersion())) {

               InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType);

               if (orderSubsidy != null) {

                  ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();

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

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

                     subsidyInfo.setColor("#E5005C");

                  } else {

                     subsidyInfo.setColor("#888888");

                  }

                  order.setSubsidy(subsidyInfo);

						
                  // 解释信息（问号）

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

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

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

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

                  order.setSubsidyList(subsidyList);

               }

            }

         }



         String hongBaoDate = null;

         String hongBaoState_Str = "";

         String hongbaoInfoFontColor = "#E5005C";



         /* 红包状态 转换 */

         String stateContent = "";

         String stateFontColor = "#E5005C";

         Integer orderHongBaoState = null;



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

            orderHongBaoState = 1;

            stateContent = "未到账";

            hongBaoState_Str = "预估";



            Date preAccountTime = order.getPreAccountTime();

            if (preAccountTime != null) {

               hongBaoDate = "预计到账时间：" + formatday.format(preAccountTime);

            }



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

            orderHongBaoState = 3;

            stateContent = "已到账";



            Date accountTime = order.getAccountTime();

            if (accountTime != null) {

               hongBaoDate = "到账时间：" + formatday.format(accountTime);

            }



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

            stateContent = "部分失效";

            orderHongBaoState = 3;

            Date accountTime = order.getAccountTime();

            if (accountTime != null) {

               hongBaoDate = "到账时间：" + formatday.format(accountTime);

            }



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

            orderHongBaoState = 4;

            stateContent = "已失效";

            hongbaoInfoFontColor = "#888888";

         }

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

         order.setAccountState(stateMap);



         hongbaoInfo = hongBaoState_Str + hongbaoInfo;



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

         hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

         hongBaoMap.put("fontColor", hongbaoInfoFontColor);

         order.setHongBaoInfo(hongBaoMap);



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

         if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {

            order.setSignList(signList);

         } else {

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

            if (sourceType == null) {

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

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

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

            }

         }



         // 分享、邀请 隐藏订单号

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

               || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));

         }

      }

   }

	
   @Override

   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,

         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,

         Integer source) {

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

   }



   @Override

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

         String endTime, Integer source) {

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

   }



   @Override

   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;

   }







	
	
   @Override

   public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId) {

      return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);

@@ -724,8 +835,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) {

@@ -785,8 +897,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) {

@@ -834,8 +947,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()) {

@@ -903,7 +1016,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, "订单为空");

@@ -946,13 +1059,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

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

         if ((oldCommonOrder.getState() == CommonOrder.STATE_JS&&oldCommonOrder.getSourceType()!=Constant.SOURCE_TYPE_JD) || 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

@@ -968,9 +1081,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);

      }

   }



@@ -1063,7 +1177,8 @@


   @Override

   public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,

         Integer type, Integer orderState, String startTime, String endTime, Integer source)

         Integer type, Integer orderState, String startTime, String endTime, Integer source,List<Long> listShopId,

         List<Long> listGoodsId, Date minTime, BigDecimal money)

         throws CommonOrderException {



      List<CommonOrderVO> list = null;

@@ -1071,10 +1186,11 @@
      if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单

         list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,

               startTime, endTime, source);

      } else

      } else {

         list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,

               source);



               source, listShopId, listGoodsId, minTime, money);

      }

		
      if (list == null) {

         list = new ArrayList<CommonOrderVO>();

      }

@@ -1258,12 +1374,15 @@


   @Override

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

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

         String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,

         Date minTime, BigDecimal money) throws CommonOrderException {

      if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单

         return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,

               source);

      } else

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

      } else {

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

               listGoodsId, minTime,money);

      }

   }



   @Override

@@ -1364,7 +1483,7 @@
   }



   @Override

   public JSONObject getRewardJumpInfo(String orderNo) {

   public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {



      JSONObject map = new JSONObject();

      // 订单标识

@@ -1381,6 +1500,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);

@@ -1447,4 +1567,48 @@
      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);

   }



	
	
   @Override

   public CommonOrderVO firstValidOrderByUid(Long uid) {

      return commonOrderMapper.firstValidOrderByUid(uid, null, null);

   }

	
   @Override

   public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type) {

      return commonOrderMapper.firstValidOrderByUid(uid, type, null);

   }

	
	
   @Override

   public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type) {

      return commonOrderMapper.firstValidOrderByUid(uid, type, 4);

   }

	
   @Override

   public CommonOrder getFirstShareOrderByUid(Long uid) {

      return commonOrderMapper.getFirstShareOrderByUid(uid);

   }

	
   @Override

   public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {

      return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);

   }

	
	
   @Override

   public long count24HValidOrderByUid(Long uid, Date minTime) {

      return commonOrderMapper.count24HValidOrderByUid(uid, minTime);

   }

}