From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 7304fa9..a6dedb0 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) {
@@ -291,7 +295,7 @@
processShareGoodsOrderNew(orderId, orders.get(orderId));
} catch (Exception e) {
try {
- LogHelper.errorDetailInfo(e, null, "璁㈠崟鍙�:" + orderId);
+ LogHelper.errorDetailInfo(e, "processShareGoodsOrderNew鍑洪敊", "璁㈠崟鍙�:" + orderId);
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -524,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鍚庡紑濮嬪疄琛岋級
@@ -962,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