From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 139 insertions(+), 61 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 184d46f..3401e05 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,16 +1,20 @@
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.dto.push.PushContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+import com.yeshi.fanli.entity.config.push.PushMsgFactory;
+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.util.StringUtil;
+import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;
@Service
@@ -19,23 +23,38 @@
@Resource
private MsgOrderDetailService msgOrderDetailService;
+ @Resource
+ private PushService pushService;
+
@Override
- public void orderFanLiStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
+ 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) {
+ PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(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 orderFanLiStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, goodsCount, orderState, payMoney,
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, orderType, 0, orderState, payMoney,
money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void orderFanLiStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
// 鏆傛椂涓嶆帹閫�
try {
msgOrderDetailService.updateMsgOrderDetail(detail, false);
@@ -46,82 +65,141 @@
}
@Override
- public void orderShareStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
+ 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();
+ }
+
+ PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(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 orderShareStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, goodsCount, orderState, payMoney,
+ MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, 0, orderState, payMoney,
money, null);
- try {
- msgOrderDetailService.addMsgOrderDetail(detail);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
-
- }
-
- @Override
- public void orderShareStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
// 鏆傛椂涓嶆帹閫�
- try {
- msgOrderDetailService.updateMsgOrderDetail(detail, false);
- } catch (MsgOrderDetailException e) {
- e.printStackTrace();
- }
+ // try {
+ // msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ // } catch (MsgOrderDetailException e) {
+ // e.printStackTrace();
+ // }
}
@Override
- public void orderInviteStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
- int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
- money, null);
+ 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);
+ 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 orderInviteStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,
+ public void orderInviteStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
int orderState) {
- MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,
- null);
+ 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.updateMsgOrderDetail(detail, false);
+ 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 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銆戝垎浜�", 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);
+ 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, BigDecimal payMoney, int orderType, Date happendDate) {
+ MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, true, payMoney, orderType,
+ happendDate, "濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�");
try {
- msgOrderDetailService.updateMsgOrderDetail(detail, false);
+ 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