Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

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



@@ -469,7 +471,7 @@
                  CMQManager.getInstance().addWeiQuanOrderMsg(order);

               }

            } catch (Exception e) {

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

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

            }

         }

   }

@@ -572,7 +574,16 @@
      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);

@@ -589,7 +600,7 @@
                  hongBaoList.remove(i);

                  i--;

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

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

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

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

                     hongBaoList.remove(i);

                     i--;

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

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

@@ -978,6 +991,11 @@
   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))

@@ -1215,22 +1233,21 @@


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

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

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

            }

         }

         }

		
		


   }

}