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/util/SpringContext.java

@@ -24,6 +24,7 @@
import com.yeshi.fanli.entity.jd.JDOrder;

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

import com.yeshi.fanli.entity.push.PushQueueRecord;

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

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

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

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

@@ -45,6 +46,7 @@
import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;

import com.yeshi.fanli.util.cmq.ThreeSaleCMQManager;

import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;

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



/**

 * 系统初始化

@@ -130,10 +132,12 @@
         doThreeSaleUserCouponJob();// 处理邀请队列

         doUserMoneyDebtJob();// 债务偿还

         initScheduler();// 启动商品更新定时任务

         doUpdateGoodsJob(); // 更新商品队列			
         doUpdateGoodsJob(); // 更新商品队列

         doJDOrderJob();// 京东订单处理

         doPDDOrderJob();// 拼多多订单处理

         doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新

      }



   }



   /**

@@ -201,12 +205,13 @@
            public void run() {

               while (true) {

                  try {



                     // 取16个订单

                     List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);

                     Map<String, List<TaoBaoOrder>> map = new HashMap<>();

                     if (orderIds != null) {

                        for (String orderId : orderIds) {

                           if (NumberUtil.isNumeric(orderId.trim())) {

                              Map<String, List<TaoBaoOrder>> map = new HashMap<>();

                              List<TaoBaoOrder> orderList = taoBaoOrderService

                                    .getTaoBaoOrderByOrderId(orderId);

                              map.put(orderId, orderList);

@@ -565,7 +570,6 @@
                  }

               } catch (Exception e) {

                  LogHelper.error("还款出错:" + e.getMessage());



               }

            }

         }

@@ -630,21 +634,56 @@
                           }

                           PDDOrderCMQManager.getInstance().deletePDDOrder(key);

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                           LogHelper.errorDetailInfo(e);

                        }

                     }

                  }

               } catch (Exception e) {

                  LogHelper.error("拼多多订单:" + e.getMessage());



               }

            }

         }

      });



   }



   /**

    * 重要的淘宝商品信息更新

    */

   public void doImportantTaoBaoGoodsUpdateJob() {

      // 开启2个线程做更新

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

         executor.execute(new Runnable() {

            @Override

            public void run() {

               while (true) {

                  Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16);

                  if (map != null) {

                     Iterator<String> its = map.keySet().iterator();

                     while (its.hasNext()) {

                        String key = its.next();

                        try {

                           long startTime = System.currentTimeMillis();

                           TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(map.get(key));

                           // 更新一条数据需要的时间

                           taoBaoGoodsUpdateService.updateTaoBaoGoods(goods);

                           long time = System.currentTimeMillis() - startTime;

                           LogHelper.test("淘宝重要商品库更新时间:" + time);

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        } finally {

                           CMQManager.getInstance().deleteTBImpGoodsUpdateMsg(key);

                        }

                     }

                  }

               }

            }

         });



   }



}