From 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 15:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 ff85ab5..c4b87c1 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,6 +1,7 @@
package com.yeshi.fanli.service.impl.msg;
import java.math.BigDecimal;
+import java.util.Date;
import javax.annotation.Resource;
@@ -10,7 +11,6 @@
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.util.factory.msg.MsgOrderDetailFactory;
@Service
@@ -25,7 +25,9 @@
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();
}
@@ -51,7 +53,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();
}
@@ -78,7 +81,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();
}
@@ -111,7 +115,8 @@
MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,
money, String.format("鐢变竴绾ч槦鍛樸��%s銆戝垎浜�", getShortName(sourceUserName)));
try {
- msgOrderDetailService.addMsgOrderDetail(detail);
+ msgOrderDetailService.addMsgOrderDetail(detail,
+ (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);
} catch (MsgOrderDetailException e) {
e.printStackTrace();
}
@@ -128,7 +133,28 @@
} 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