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/msg/UserOrderMsgNotificationServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 86 insertions(+), 10 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..7487ec6 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,15 +1,19 @@
package com.yeshi.fanli.service.impl.msg;
import java.math.BigDecimal;
+import java.util.Date;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+import com.yeshi.fanli.exception.PushException;
import com.yeshi.fanli.exception.msg.MsgOrderDetailException;
import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;
+import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;
@Service
@@ -18,14 +22,26 @@
@Resource
private MsgOrderDetailService msgOrderDetailService;
+ @Resource
+ private PushService pushService;
+
@Override
public void orderFanLiStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, goodsCount, orderState, payMoney,
money, null);
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)
+ pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
+ Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
+ } catch (PushException e) {
e.printStackTrace();
}
}
@@ -35,8 +51,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();
}
@@ -49,7 +66,8 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, goodsCount, orderState, payMoney,
money, null);
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -61,11 +79,12 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,
null);
- try {
- msgOrderDetailService.updateMsgOrderDetail(detail);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
+ // 鏆傛椂涓嶆帹閫�
+// try {
+// msgOrderDetailService.updateMsgOrderDetail(detail, false);
+// } catch (MsgOrderDetailException e) {
+// e.printStackTrace();
+// }
}
@@ -75,7 +94,8 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
money, null);
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -86,12 +106,68 @@
int orderState) {
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
null);
+ // 鏆傛椂涓嶆帹閫�
+// try {
+// 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.updateMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} 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, true);
+ } 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, true);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0