奖励券使用区分订单下单三方日期

yujian

2019-08-28 d88c167fc5973a2c15ff1539e4cdab36e4a7842c

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

@@ -16,7 +16,9 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Propagation;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.NumberUtil;



import com.google.gson.Gson;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

@@ -28,9 +30,12 @@
import com.yeshi.fanli.entity.bus.user.Order;

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

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

import com.yeshi.fanli.entity.jd.JDOrder;

import com.yeshi.fanli.entity.jd.JDOrderItem;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

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

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

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

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

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

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

@@ -54,14 +59,16 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

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

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

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

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

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;



@Service

@@ -72,9 +79,6 @@


   @Resource

   private UserInfoMapper userInfoMapper;



   @Resource

   private UserNotificationService userNotificationService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;

@@ -225,8 +229,9 @@


   @Override

   public void fanli() {

      LogHelper.test("处理返利到账");

      // 获取主红包

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 1000);

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBaoV2.TYPE_ZIGOU, 1000);

      //

      // /**

      // * 需要实时更新待返利的订单

@@ -290,10 +295,22 @@
   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());

      // 正常用户才能到账

      UserInfo mainUser = userInfoMapper.selectByPrimaryKey(hb1.getUserInfo().getId());

      if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {

         return;

      }

      // 查询红包相关联的订单

      HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb1.getId());

      if (hongBaoOrder == null) {

         LogHelper.error("返利失败:" + hb1.getId());

         return;

      }



      // 灰度测试中，京东/拼多多不返利

      if (hongBaoOrder.getCommonOrder() == null

            || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD

            || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD) {

         return;

      }



@@ -391,20 +408,10 @@


         // 站内信+推送

         UserInfo user = userInfoMapper.selectByPKey(uid);

         try {

            userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                  userGoodsCount.get(uid), user.getMyHongBao(), money);

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }



         // 新版通知

         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

               userGoodsCount.get(uid), money, user.getMyHongBao());

               hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao());

      }

      // 通知免单到账

      try {

@@ -427,10 +434,12 @@
               if (olist != null && olist.size() > 0) {

                  long time = TimeUtil.convertToTimeTemp(olist.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");

                  olist = TaoKeOrderApiUtil.getTaoBaoAllOrder(TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"),

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

                        TaoKeOrderApiUtil.TK_STATUS_ALL);

                  List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(

                        TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                        TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                        TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                  if (thirdOList != null && thirdOList.size() > 0)

                     olist.addAll(thirdOList);



@@ -457,8 +466,12 @@
   public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {

      if (orderList != null)

         for (TaoBaoWeiQuanOrder order : orderList) {

            if (order.getState().contains("维权成功")) {

               CMQManager.getInstance().addWeiQuanOrderMsg(order);

            try {

               if (order.getState().contains("维权成功")) {

                  CMQManager.getInstance().addWeiQuanOrderMsg(order);

               }

            } catch (Exception e) {

               LogHelper.error("维权订单加入到队列出错:" + order != null ? new Gson().toJson(order) : null);

            }

         }

   }

@@ -561,7 +574,41 @@
      List<Integer> types = new ArrayList<>();

      types.add(HongBaoV2.TYPE_YIJI);

      types.add(HongBaoV2.TYPE_ERJI);

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 1000);

      long count=   hongBaoV2Mapper.countCanBalanceHongBaoByTypeAndUid(types, uid);

      List<HongBaoV2> hongBaoList =new ArrayList<>();

       //1000条数据为1页

      int page=(int)   (count%1000==0?count/1000:count/1000+1);

      for(int i=0;i<page;i++)

      {

         List<HongBaoV2> tempHongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, i*1000,1000);

         if(tempHongBaoList!=null&&tempHongBaoList.size()>0)

            hongBaoList.addAll(tempHongBaoList);

      }

      // 灰度测试中，京东/拼多多订单分享/邀请订单不返利

      for (int i = 0; i < hongBaoList.size(); i++) {

         HongBaoV2 item = hongBaoList.get(i);

         if (item.getType() == HongBaoV2.TYPE_SHARE_GOODS) {

         } else {

            item = item.getParent();

         }

         if (item != null) {

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId());

            if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {

               CommonOrder co = hongBaoOrder.getCommonOrder();

               if (co.getSourceType() == Constant.SOURCE_TYPE_JD

                     || co.getSourceType() == Constant.SOURCE_TYPE_PDD) {

                  hongBaoList.remove(i);

                  i--;

               } else {// 上级用户不是正常用户，订单均不能到账

                  UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());

                  if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                     hongBaoList.remove(i);

                     i--;

                  }

               }

            }

         }

      }



      List<Long> hbIdList = new ArrayList<>();



@@ -613,7 +660,8 @@
      types.clear();

      types.add(HongBaoV2.TYPE_SHARE_YIJI);

      types.add(HongBaoV2.TYPE_SHARE_ERJI);

      List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);

      //TODO 需要处理超过1w条数据的订单

      List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid,0, 10000);



      if (hbList != null && hbList.size() > 0)

         totalHongBaoList.addAll(hbList);

@@ -661,8 +709,8 @@
            long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                  minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,

                  (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());



            // 增加资金

            userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);

@@ -676,18 +724,9 @@
            }

         }



         // 发送推送

         try {

            // 提成到账消息通知

            userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,

                  invitemoney);

         } catch (Exception e) {

            e.printStackTrace();

         }



         // 新版通知

         userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,

               userInfoMapper.selectByPKey(uid).getMyHongBao());

         userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),

               inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

@@ -706,7 +745,8 @@
      // 查询UID的分享赚订单

      types.clear();

      types.add(HongBaoV2.TYPE_SHARE_GOODS);

      List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);

      //TODO 需要处理超过10000条数据的订单

      List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid,0, 10000);

      for (HongBaoV2 hongBao : hongBaoShareList) {

         hongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBao.getId());

         hongBao = filterWeiQuanINGHongBao(hongBao);

@@ -753,12 +793,15 @@


            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount =  hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS, minDate, maxDate);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate);

            long invalidCount =hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, minDate, maxDate);

            long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                  minDate, maxDate);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                  minDate, maxDate);

            long invalidCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                  minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                  (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -772,18 +815,9 @@
            }

         }



         // 发送推送

         try {

            // 提成到账消息通知

            userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,

                  sharemoney);

         } catch (Exception e) {

            e.printStackTrace();

         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);

@@ -953,4 +987,267 @@
      }

   }



   @Override

   public void processJDOrder(JDOrder order) {

      if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)

         return;



      // 拆单的不做处理

      if (order.getValidCode() == 2)

         return;



      String uidStr = order.getExt1();

      Long uid = null;

      if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr))

         uid = Long.parseLong(uidStr);

      Long positionId = order.getOrderItemList().get(0).getPositionId();

      if (positionId == JDApiUtil.POSITION_FANLI)// 返利订单

      {

         processFanLiJDOrder(order, uid);

         lostOrderService.processSuceess(order.getOrderId() + "", Constant.SOURCE_TYPE_JD);

      } else if (positionId == JDApiUtil.POSITION_SHARE) {// 分享订单

         if (uid == null)// 分享订单不允许找回

            return;

         processShareJDOrder(order, uid);

      } else {// 处理是否有订单找回的状态

         processFanLiJDOrder(order, null);

      }

   }



   /**

    * 处理京东返利订单

    * 
    * @param jdOrder

    * @param uid

    */

   @Transactional

   private void processFanLiJDOrder(JDOrder jdOrder, Long uid) {

      int invalidCount = 0;

      BigDecimal totalMoney = new BigDecimal(0);

      // 订单状态判断

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

         if (item.getEstimateCosPrice() != null)

            totalMoney = totalMoney.add(item.getEstimateCosPrice());



         if (item.getValidCode() == 16 || item.getValidCode() == 17 || item.getValidCode() == 18) {// 已付款



         } else if (item.getValidCode() == 15) {// 未支付



         } else {

            invalidCount++;

         }

      }



      // 加入订单

      Order oldOrder = orderMapper.selectOrderByOrderIdAndOrderType(jdOrder.getOrderId() + "",

            Constant.SOURCE_TYPE_JD);

      if (uid == null && oldOrder != null && oldOrder.getBeizhu() != null && oldOrder.getBeizhu().contains("补单"))

         uid = oldOrder.getUserInfo().getId();



      if (uid == null)

         return;



      if (oldOrder == null)// 新增

      {

         Order order = new Order();

         order.setBeizhu("京东返利订单");

         order.setCreatetime(System.currentTimeMillis());

         order.setOrderId(jdOrder.getOrderId() + "");

         order.setOrderType(Constant.SOURCE_TYPE_JD);

         order.setState(

               invalidCount == jdOrder.getOrderItemList().size() ? Order.STATE_SHIXIAO : Order.STATE_YIZHIFU);

         order.setUserInfo(new UserInfo(uid));

         order.setVersion(2);

         order.setThirdCreateTime(new Date(jdOrder.getOrderTime()));

         order.setMoney(totalMoney);

         // 加入到订单表

         orderMapper.insertSelective(order);

      } else {

         Order updateOrder = new Order();

         updateOrder.setId(oldOrder.getId());

         updateOrder.setMoney(totalMoney);

         orderMapper.updateByPrimaryKeySelective(updateOrder);

      }



      try {

         List<CommonOrder> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + jdOrder.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + jdOrder.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }



   /**

    * 处理京东分享订单

    * 
    * @param order

    * @param uid

    */

   @Transactional

   private void processShareJDOrder(JDOrder order, Long uid) {

      try {

         List<CommonOrder> commonOrderList = commonOrderService.addJDOrder(order, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_SHARE_GOODS);

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }



   /**

    * 处理拼多多订单

    */

   @Override

   public void processPDDOrder(PDDOrder pddOrder) {

      if (pddOrder == null)

         return;

      String uidStr = pddOrder.getCustomParameters();

      Long uid = null;

      if (!StringUtil.isNullOrEmpty(uidStr))

         uid = Long.parseLong(uidStr);

      String positionId = pddOrder.getpId();

      if (PinDuoDuoApiUtil.PID_FANLI.equalsIgnoreCase(positionId))// 返利订单

      {

         processFanLiPDDOrder(pddOrder, uid);

         lostOrderService.processSuceess(pddOrder.getOrderSn(), Constant.SOURCE_TYPE_PDD);

      } else if (PinDuoDuoApiUtil.PID_SHARE.equalsIgnoreCase(positionId)) {// 分享订单

         if (uid == null)// 分享订单不允许找回

            return;

         processSharePDDOrder(pddOrder, uid);

      } else {// 处理是否有订单找回的状态

         processFanLiPDDOrder(pddOrder, null);

      }

   }



   /**

    * 处理拼多多自购返利订单

    * 
    * @param pddOrder

    * @param uid

    */

   @Transactional

   private void processFanLiPDDOrder(PDDOrder pddOrder, Long uid) {

      int orderState = 0;

      if (pddOrder.getOrderStatus() == -1 || pddOrder.getOrderStatus() == 8)

         orderState = Order.STATE_SHIXIAO;

      else

         orderState = Order.STATE_YIZHIFU;



      BigDecimal totalMoney = MoneyBigDecimalUtil.div(new BigDecimal(pddOrder.getOrderAmount()), new BigDecimal(100));



      // 加入订单

      Order oldOrder = orderMapper.selectOrderByOrderIdAndOrderType(pddOrder.getOrderSn(), Constant.SOURCE_TYPE_PDD);

      if (uid == null && oldOrder != null && oldOrder.getBeizhu() != null && oldOrder.getBeizhu().contains("补单"))

         uid = oldOrder.getUserInfo().getId();



      if (uid == null)

         return;



      if (oldOrder == null)// 新增

      {

         Order order = new Order();

         order.setBeizhu("拼多多返利订单");

         order.setCreatetime(System.currentTimeMillis());

         order.setOrderId(pddOrder.getOrderSn());

         order.setOrderType(Constant.SOURCE_TYPE_PDD);

         order.setState(orderState);

         order.setUserInfo(new UserInfo(uid));

         order.setVersion(2);

         order.setThirdCreateTime(new Date(pddOrder.getOrderCreateTime() * 1000));

         order.setMoney(totalMoney);

         // 加入到订单表

         orderMapper.insertSelective(order);

      } else {

         Order updateOrder = new Order();

         updateOrder.setId(oldOrder.getId());

         updateOrder.setMoney(totalMoney);

         orderMapper.updateByPrimaryKeySelective(updateOrder);

      }



      try {

         List<PDDOrder> pddOrderList = new ArrayList<>();

         pddOrderList.add(pddOrder);

         List<CommonOrder> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addPDDOrder或addHongBao出错", "订单号:" + pddOrder.getOrderSn());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addPDDOrder或addHongBao出错", "订单号:" + pddOrder.getOrderSn());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }



   /**

    * 处理拼多多分享订单

    * 
    * @param order

    * @param uid

    */

   @Transactional

   private void processSharePDDOrder(PDDOrder order, Long uid) {

      try {

         List<PDDOrder> pddOrderList = new ArrayList<>();

         pddOrderList.add(order);

         List<CommonOrder> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_SHARE_GOODS);

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }



   @Override

   public void repairCommonOrderByByTaoBaoOrder(String orderId) {

      // 根据订单号查询淘宝订单

      List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);

      if (orderList != null)

         for (TaoBaoOrder order : orderList) {

            // 根据交易ID查询常规订单

            CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

                  order.getTradeId());

            // 修复orderby

            if (commonOrder != null) {

               CommonOrder update = new CommonOrder(commonOrder.getId());

               update.setOrderBy(order.getOrderBy());

               update.setUpdateTime(new Date());

               commonOrderService.updateByPrimaryKeySelective(update);

            }

         }



   }

}