From d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 18:21:04 +0800
Subject: [PATCH] 消息修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java | 164 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 117 insertions(+), 47 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java
index 4cc82b2..c154ce8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java
@@ -1,21 +1,35 @@
package com.yeshi.fanli.service.impl.order.msg;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.push.PushContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgExtra;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.config.push.PushMsgFactory;
import com.yeshi.fanli.exception.msg.MsgOrderDetailException;
import com.yeshi.fanli.exception.push.PushException;
+import com.yeshi.fanli.service.inter.msg.MsgExtraService;
import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
@Service
public class UserOrderMsgNotificationServiceImpl implements UserOrderMsgNotificationService {
@@ -25,20 +39,20 @@
@Resource
private PushService pushService;
+
+ @Resource
+ private MsgExtraService msgExtraService;
+
@Override
public void orderFanLiStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int goodsCount, int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, orderType, goodsCount, orderState,
- payMoney, money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail,
- (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
-
- if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) {
+ int goodsCount, int orderState, Date downTime) {
+ // 鏄惁閫氱煡
+ boolean needNotify = (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) ? true : false;
+ // 淇濆瓨娑堟伅鏄庣粏娑堟伅
+ addOrderStatistics(uid, orderId, orderType, Constant.TYPE_REBATE, goodsCount, payMoney, money, downTime, null, needNotify);
+
+ if (needNotify) {
PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(orderType, orderId, money);
try {
pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
@@ -66,17 +80,14 @@
@Override
public void orderShareStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int goodsCount, int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, goodsCount, orderState,
- payMoney, money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail,
- (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
+ int goodsCount, int orderState, Date downTime) {
+ // 鏄惁閫氱煡
+ boolean needNotify = (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) ? true : false;
+ // 淇濆瓨娑堟伅鏄庣粏娑堟伅
+ addOrderStatistics(uid, orderId, orderType, Constant.TYPE_SHAER, goodsCount, payMoney, money, downTime, null, needNotify);
+
- PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(orderType, orderId, money);
+ PushContentDTO dto = PushMsgFactory.createShareOrderStatisticed(orderType, orderId, money);
try {
pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
} catch (NumberFormatException e) {
@@ -103,15 +114,12 @@
@Override
public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int goodsCount, int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, goodsCount, orderState,
- payMoney, money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail,
- (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
+ int goodsCount, int orderState, Date downTime) {
+ // 鏄惁閫氱煡
+ boolean needNotify = (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) ? true : false;
+ // 淇濆瓨娑堟伅鏄庣粏娑堟伅
+ addOrderStatistics(uid, orderId, orderType, Constant.TYPE_INVITE, goodsCount, payMoney, money, downTime, null, needNotify);
+
PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(orderType, orderId, money);
try {
@@ -148,7 +156,7 @@
public void orderShareFirstLevelStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney,
BigDecimal money, int goodsCount, int orderState, String sourceUserName) {
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, goodsCount, orderState,
- payMoney, money, String.format("鐢变竴绾ч槦鍛樸��%s銆戝垎浜�", getShortName(sourceUserName)));
+ payMoney, money, String.format("鐢辩洿鎺ョ矇涓濄��%s銆戝垎浜�", getShortName(sourceUserName)));
try {
msgOrderDetailService.addMsgOrderDetail(detail,
(money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
@@ -164,7 +172,6 @@
} catch (PushException e) {
e.printStackTrace();
}
-
}
@Override
@@ -181,25 +188,13 @@
}
@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();
- }
+ public void orderFoundSuccess(Long uid, String orderId, int orderSource, int type, BigDecimal payMoney, BigDecimal money, int goodsCount, Date submitTime) {
+ createOrderFoundSuccess(uid, orderId, orderSource, type, goodsCount, payMoney, money, submitTime, "");
}
@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();
- }
+ createOrderFoundFail(uid, orderId, null);
}
@Override
@@ -228,4 +223,79 @@
}
}
+
+
+ /**
+ * 鍒涘缓璁㈠崟琚粺璁℃秷鎭�
+ * @param uid
+ * @param orderId 璁㈠崟鍙�
+ * @param source 璁㈠崟鏉ユ簮锛氭窐瀹濄�佷含涓溿�佸ぉ鐚�
+ * @param type 璁㈠崟绫诲瀷锛氳嚜璐�佸垎浜�佸洟闃�
+ * @param goodsCount 鍟嗗搧鏁伴噺
+ * @param payMoney 浠樻閲戦
+ * @param money 杩斿埄閲戦
+ * @param downTime 涓嬪崟鏃堕棿
+ * @param beiZhu 澶囨敞淇℃伅 - 闈炲繀濉�
+ * @return
+ */
+ @Transactional
+ private void addOrderStatistics(Long uid, String orderId, int source, int type, int goodsCount,
+ BigDecimal payMoney, BigDecimal money, Date downTime, String beiZhu, boolean needNotify) {
+ try {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createOrderStatistics(uid, orderId, source, type, goodsCount, payMoney, money, downTime, beiZhu);
+ // 娑堟伅
+ msgOrderDetailService.addMsgOrderDetail(detail, needNotify);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(),detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 璁㈠崟鎵惧洖鎴愬姛
+ * @param uid
+ * @param orderId 璁㈠崟鍙�
+ * @param source 璁㈠崟鏉ユ簮锛氭窐瀹濄�佷含涓溿�佸ぉ鐚�
+ * @param type 璁㈠崟绫诲瀷锛氳嚜璐�佸垎浜�佸洟闃�
+ * @param goodsCount 鍟嗗搧鏁伴噺
+ * @param payMoney 浠樻閲戦
+ * @param money 杩斿埄閲戦
+ * @param submitTime 鎻愪氦鏃堕棿
+ * @param beiZhu 澶囨敞淇℃伅 - 闈炲繀濉�
+ * @return
+ */
+ private void createOrderFoundSuccess(Long uid, String orderId, int source, int type, int goodsCount,
+ BigDecimal payMoney, BigDecimal money, Date submitTime, String beiZhu) {
+ try {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundSuccess(uid, orderId, source, type, goodsCount, payMoney, money, submitTime, beiZhu);
+ // 娑堟伅
+ msgOrderDetailService.addMsgOrderDetail(detail, true);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 璁㈠崟鎵惧洖澶辫触
+ * @param uid
+ * @param orderId
+ * @param beiZhu
+ * @return
+ */
+ private void createOrderFoundFail(Long uid, String orderId, String beiZhu) {
+ try {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundFail(uid, orderId, beiZhu);
+ // 娑堟伅
+ msgOrderDetailService.addMsgOrderDetail(detail, true);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0