From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
index 9b08ba6..f50642e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.msg;
import java.math.BigDecimal;
+import java.util.Date;
import javax.annotation.Resource;
@@ -35,8 +36,9 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -61,8 +63,9 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -86,12 +89,70 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
}
+ private String getShortName(String name) {
+ if (name != null && name.length() > 2) {
+ return name.charAt(0) + "**" + name.charAt(name.length() - 1);
+ }
+ return name;
+ }
+
+ @Override
+ public void orderShareFirstLevelStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
+ int goodsCount, int orderState, String sourceUserName) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
+ money, String.format("鐢变竴绾ч槦鍛樸��%s銆戝垎浜�", getShortName(sourceUserName)));
+ try {
+ msgOrderDetailService.addMsgOrderDetail(detail);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void orderShareFirstLevelStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
+ int orderState) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
+ null);
+ // 鏆傛椂涓嶆帹閫�
+ try {
+ msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType,
+ Date happendDate) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, true, payMoney, orderType,
+ happendDate, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
+ try {
+ msgOrderDetailService.addMsgOrderDetail(detail);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType,
+ Date happendDate) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, false, payMoney, orderType,
+ happendDate, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
+ try {
+ msgOrderDetailService.addMsgOrderDetail(detail);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0