From d5c2554ebae75afbff31c3c2966cc3a747ba941c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 7 +++----
1 files changed, 3 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 a08c7b1..433fb55 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
@@ -133,10 +133,10 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
-
+
@Resource
private UserOrderMsgNotificationService userOrderMsgNotificationService;
-
+
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -1281,8 +1281,7 @@
update.setUpdateTime(new Date());
hongBaoV2Service.updateByPrimaryKeySelective(update);
}
-
-
+
if (hongBao.getType() == HongBaoV2.TYPE_ZIGOU || hongBao.getType() == HongBaoV2.TYPE_SHARE_GOODS) {
userOrderMsgNotificationService.orderInvalidToBusinessRunning(uid, orderId, sourceType, hongBao.getType());
}
--
Gitblit v1.8.0