唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 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;

@@ -33,10 +34,13 @@
import com.yeshi.fanli.entity.pdd.PDDOrder;

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

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

import com.yeshi.fanli.entity.suning.SuningOrderInfo;

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;

import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;

import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;

@@ -49,7 +53,9 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;

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.suning.SuningOrderService;

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;

@@ -67,7 +73,9 @@
import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;

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

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

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

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

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

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



/**

@@ -148,6 +156,12 @@
   @Resource

   private TeamEincomeManager teamEincomeManager;



   @Resource

   private VipShopOrderService vipShopOrderService;

	
   @Resource

   private SuningOrderService suningOrderService;



   private static boolean isInited = false;



   public void onApplicationEvent(ContextRefreshedEvent arg0) {

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

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

         doOrderFanLiNew();// 新版返利



         doOrderShareFanLi();

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

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

@@ -181,6 +194,8 @@
         doUpdateGoodsJob(); // 更新商品队列

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

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

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

         doSuningOrderJob();// 苏宁订单处理

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

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

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

@@ -191,6 +206,7 @@
         doOrderTeamIncomeFanLi();

         doDividentsJob();

      }

		
   }



   /**

@@ -397,7 +413,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();

                           }

@@ -699,6 +715,76 @@
                  }

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

                           LogHelper.test("唯品会订单消费:"+orderId);

                           if (!StringUtil.isNullOrEmpty(orderId)) {

                              List<VipShopOrder> orderList = vipShopOrderService.listDetailByOrderSn(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.errorDetailInfo(e);

               }

            }

         }

      });



   }

	
	
   public void doSuningOrderJob() {

      executor.execute(new Runnable() {

         @Override

         public void run() {

            while (true) {

               try {

                  Map<String, String> map = SuningOrderCMQManager.getInstance().consumeSuningOrder(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<SuningOrderInfo> orderList = suningOrderService.listByOrderCode(orderId);

                              if (orderList != null)

                                 for (SuningOrderInfo order : orderList)

                                    orderProcessService.processSuningOrder(order);

                           }

                           SuningOrderCMQManager.getInstance().deleteSuningOrder(key);

                        } catch (Exception e) {

                           LogHelper.errorDetailInfo(e);

                        }

                     }

                  }

               } catch (Exception e) {

                  LogHelper.errorDetailInfo(e);

               }

            }

         }

@@ -1162,7 +1248,19 @@
                     try {

                        teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getDate());

                        TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);

                     } catch (Exception e) {

                     } catch (TeamDividentsRecordException e1) {

                        if (e1.getCode() == TeamDividentsRecordException.CODE_EXIST) {

                           TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);

                        } else {

                           try {

                              LogHelper.errorDetailInfo(e1);

                           } catch (Exception e2) {

                              e2.printStackTrace();

                           }

                        }

                     }



                     catch (Exception e) {

                        try {

                           LogHelper.errorDetailInfo(e);

                        } catch (Exception e1) {