From ee1d39f11b9483b64a88029f1755a6e7166fea15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 16:49:21 +0800
Subject: [PATCH] 等级显示问题
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 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 32a1234..145d2e5 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
@@ -9,12 +9,10 @@
import org.springframework.transaction.annotation.Transactional;
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.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;
@@ -29,9 +27,6 @@
@Resource
private PushService pushService;
-
- @Resource
- private MsgExtraService msgExtraService;
@Override
@@ -78,12 +73,21 @@
@Override
public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
- int goodsCount, int orderState, Date downTime) {
- // 鏄惁閫氱煡
- boolean needNotify = (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) ? true : false;
+ BigDecimal subsidy, int goodsCount, int orderState, Date downTime) {
+ BigDecimal totalMoney = new BigDecimal(0);
+ if (money != null) {
+ totalMoney = totalMoney.add(money);
+ }
+ if (subsidy != null) {
+ totalMoney = totalMoney.add(subsidy);
+ }
+
+ if (totalMoney.compareTo(new BigDecimal(0)) <= 0) {
+ return;
+ }
+
// 淇濆瓨娑堟伅鏄庣粏娑堟伅
- addOrderStatistics(uid, orderId, orderType, Constant.TYPE_INVITE, goodsCount, payMoney, money, downTime, null, needNotify);
-
+ addOrderStatistics(uid, orderId, orderType, Constant.TYPE_INVITE, goodsCount, payMoney, totalMoney, downTime, null, true);
PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(orderType, orderId, money);
try {
@@ -115,8 +119,6 @@
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();
}
@@ -131,8 +133,6 @@
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();
}
@@ -145,8 +145,6 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundFail(uid, orderId, "");
// 娑堟伅
msgOrderDetailService.addMsgOrderDetail(detail, true);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0