From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
index 0958a36..57c2d2e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
@@ -6,7 +6,7 @@
import org.springframework.stereotype.Service;
-import com.yeshi.fanli.controller.client.UserInfoController;
+import com.yeshi.fanli.controller.client.v1.UserInfoController;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -64,19 +64,6 @@
try {
pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),
Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()), null, null);
- } catch (PushException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void orderFanliStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,
- BigDecimal money) {
- if (Constant.IS_TEST)
- return;
- try {
- pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
- Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
} catch (PushException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0