From 160c9b86a3dd9cf9823759ba2fa7acdfea40b6d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 09:57:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java | 192 +++++------------------------------------------
1 files changed, 23 insertions(+), 169 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 c154ce8..32a1234 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,16 @@
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;
@@ -24,12 +19,7 @@
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 {
@@ -64,19 +54,6 @@
}
}
- @Override
- public void orderFanLiStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, orderType, 0, orderState, payMoney,
- money, null);
- // 鏆傛椂涓嶆帹閫�
- try {
- msgOrderDetailService.updateMsgOrderDetail(detail, false);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
-
- }
@Override
public void orderShareStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
@@ -98,19 +75,6 @@
}
- @Override
- public void orderShareStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, 0, orderState, payMoney,
- money, null);
- // 鏆傛椂涓嶆帹閫�
- // try {
- // msgOrderDetailService.updateMsgOrderDetail(detail, false);
- // } catch (MsgOrderDetailException e) {
- // e.printStackTrace();
- // }
-
- }
@Override
public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
@@ -130,100 +94,6 @@
e.printStackTrace();
}
}
-
- @Override
- public void orderInviteStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, 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, 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)));
- try {
- msgOrderDetailService.addMsgOrderDetail(detail,
- (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
-
- PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(orderType, orderId, money);
- try {
- pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (PushException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void orderShareFirstLevelStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney,
- BigDecimal money, int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, 0, orderState,
- payMoney, money, null);
- // 鏆傛椂涓嶆帹閫�
- // try {
- // msgOrderDetailService.updateMsgOrderDetail(detail, false);
- // } catch (MsgOrderDetailException e) {
- // e.printStackTrace();
- // }
- }
-
- @Override
- 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) {
- createOrderFoundFail(uid, orderId, null);
- }
-
- @Override
- public void orderElmeStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createElmeOrder(uid, orderId, orderType, orderState, payMoney,
- money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail,
- (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void orderElmeStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createElmeOrder(uid, orderId, orderType, orderState, payMoney,
- money, null);
- // 鏆傛椂涓嶆帹閫�
- try {
- msgOrderDetailService.updateMsgOrderDetail(detail, false);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
- }
-
-
/**
* 鍒涘缓璁㈠崟琚粺璁℃秷鎭�
@@ -238,7 +108,7 @@
* @param beiZhu 澶囨敞淇℃伅 - 闈炲繀濉�
* @return
*/
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
private void addOrderStatistics(Long uid, String orderId, int source, int type, int goodsCount,
BigDecimal payMoney, BigDecimal money, Date downTime, String beiZhu, boolean needNotify) {
try {
@@ -251,24 +121,28 @@
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) {
+
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void orderFoundSuccess(Long uid, String orderId, int orderSource, int type, BigDecimal payMoney, BigDecimal money, int goodsCount, Date submitTime) {
try {
- MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundSuccess(uid, orderId, source, type, goodsCount, payMoney, money, submitTime, beiZhu);
+ MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundSuccess(uid, orderId, orderSource, type, goodsCount, payMoney, money, submitTime, "");
+ // 娑堟伅
+ msgOrderDetailService.addMsgOrderDetail(detail, true);
+ // 娑堟伅鍐呭
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);
+ } catch (MsgOrderDetailException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ public void orderFoundFail(Long uid, String orderId) {
+ try {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundFail(uid, orderId, "");
// 娑堟伅
msgOrderDetailService.addMsgOrderDetail(detail, true);
// 娑堟伅鍐呭
@@ -277,25 +151,5 @@
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