From d525f0175016f802def58d244235bd0285df5235 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 四月 2020 15:09:11 +0800
Subject: [PATCH] 分享订单到账,团队订单到账,团队分红到账修改

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index ac72c98..ec07767 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -37,6 +37,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
 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;
@@ -1162,7 +1163,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) {

--
Gitblit v1.8.0