券后价调整

yujian

2020-06-08 b3da9f82b7740d39742fef1a81a56c22fe1c8b9c

 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -18,6 +18,7 @@
import org.yeshi.utils.tencentcloud.COSManager;

import org.yeshi.utils.tencentcloud.entity.COSInitParams;



import com.google.gson.Gson;

import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;

import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;

import com.yeshi.fanli.dto.mq.UidDateDTO;

@@ -36,7 +37,6 @@
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.entity.vipshop.VipShopOrder;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.order.dividents.TeamDividentsRecordException;

import com.yeshi.fanli.log.LogHelper;

@@ -52,7 +52,6 @@
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.vipshop.VipShopOrderService;

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

@@ -71,7 +70,6 @@
import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;

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



/**

@@ -152,8 +150,8 @@
   @Resource

   private TeamEincomeManager teamEincomeManager;



   @Resource

   private VipShopOrderService vipShopOrderService;

//   @Resource

//   private VipShopOrderService vipShopOrderService;



   private static boolean isInited = false;



@@ -179,7 +177,6 @@
         doTaoBaoOrders();// 处理淘宝订单

         doTaoBaoNewOrders();// 处理淘宝订单（刚刚产生的）

         doOrderFanLiNew();// 新版返利



         doOrderShareFanLi();

         doWeiQuanOrder();// 处理维权订单

         doPushIOS();// 处理发送IOS消息

@@ -188,7 +185,7 @@
         doUpdateGoodsJob(); // 更新商品队列

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

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

         doVipShopOrderJob();// 唯品会订单处理

//         doVipShopOrderJob();// 唯品会订单处理

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

         doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加

         // doPlaceOrderIntegralJob();// 下单赠送金币任务

@@ -199,6 +196,7 @@
         doOrderTeamIncomeFanLi();

         doDividentsJob();

      }

		
   }



   /**

@@ -405,7 +403,7 @@
                           TeamOrderCMQManager.getInstance().deleteTeamIncomePreMsg(handler);

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");

                              LogHelper.errorDetailInfo(e,new Gson().toJson(map.get(handler)).toString(), "");

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

@@ -714,39 +712,39 @@


   }



   public void doVipShopOrderJob() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {

                  Map<String, String> map = VipShopOrderCMQManager.getInstance().consumeVipShopOrder(16);

                  if (map != null) {

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

                     while (its.hasNext()) {

                        String key = its.next();

                        try {

                           String orderId = map.get(key);

                           if (!StringUtil.isNullOrEmpty(orderId)) {

                              List<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);

                              if (orderList != null)

                                 for (VipShopOrder order : orderList)

                                    orderProcessService.processVipShopOrder(order);

                           }

                           VipShopOrderCMQManager.getInstance().deleteVipShopOrder(key);

                        } catch (Exception e) {

                           LogHelper.errorDetailInfo(e);

                        }

                     }

                  }

               } catch (Exception e) {

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

               }

            }

         }

      });



   }

//   public void doVipShopOrderJob() {

//      executor.execute(new Runnable() {

//         @Override

//         public void run() {

//            while (true) {

//               try {

//                  Map<String, String> map = VipShopOrderCMQManager.getInstance().consumeVipShopOrder(16);

//                  if (map != null) {

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

//                     while (its.hasNext()) {

//                        String key = its.next();

//                        try {

//                           String orderId = map.get(key);

//                           if (!StringUtil.isNullOrEmpty(orderId)) {

//                              List<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);

//                              if (orderList != null)

//                                 for (VipShopOrder order : orderList)

//                                    orderProcessService.processVipShopOrder(order);

//                           }

//                           VipShopOrderCMQManager.getInstance().deleteVipShopOrder(key);

//                        } catch (Exception e) {

//                           LogHelper.errorDetailInfo(e);

//                        }

//                     }

//                  }

//               } catch (Exception e) {

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

//               }

//            }

//         }

//      });

//

//   }



   /**

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