兑换邀请码调整

yujian

2019-08-23 89e89fe2b2a1578a94b2e2c8ee81efbfbbf85f08

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

            }

         }

   }

@@ -978,6 +980,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 +1222,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);

            }

         }

         }

		
		


   }

}