From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:48 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index bb0e8e5..d6866c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -70,6 +70,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -166,6 +167,9 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
@@ -287,7 +291,16 @@
Iterator<String> its = orders.keySet().iterator();
while (its.hasNext()) {
String orderId = its.next();
- processShareGoodsOrderNew(orderId, orders.get(orderId));
+ try {
+ processShareGoodsOrderNew(orderId, orders.get(orderId));
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e, "processShareGoodsOrderNew鍑洪敊", "璁㈠崟鍙�:" + orderId);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
}
}
}
@@ -488,7 +501,7 @@
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e1) {
try {
- LogHelper.errorDetailInfo(e1);
+ LogHelper.errorDetailInfo(e1,"璁㈠崟鍙�:"+hongBaoOrder.getCommonOrder().getOrderNo(),"");
} catch (Exception e2) {
e2.printStackTrace();
}
@@ -515,7 +528,12 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
userGoodsCount.get(uid), money, user.getMyHongBao());
-
+ }
+ // 閫氱煡鍏嶅崟鍒拌处
+ try {
+ userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo());
+ } catch (Exception e) {
+ e.printStackTrace();
}
// 缁存潈鎵ｆ锛�2018-08-05鍚庡紑濮嬪疄琛岋級
@@ -953,7 +971,7 @@
hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
} catch (CommonOrderException e) {
try {
- LogHelper.errorDetailInfo(e, null, "璁㈠崟鍙�:" + orderId);
+ LogHelper.errorDetailInfo(e, "addTaoBaoOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
} catch (Exception e1) {
e1.printStackTrace();
}
--
Gitblit v1.8.0