From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java |   71 +++++++++++++++++++++++++++--------
 1 files changed, 55 insertions(+), 16 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..7487ec6 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,19 @@
 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.entity.bus.msg.MsgOrderDetail;
+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.Constant;
 import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;
 
 @Service
@@ -19,14 +22,26 @@
 	@Resource
 	private MsgOrderDetailService msgOrderDetailService;
 
+	@Resource
+	private PushService pushService;
+
 	@Override
 	public void orderFanLiStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,
 			int orderState) {
 		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();
+		}
+
+		try {
+			if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)
+				pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
+						Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
+		} catch (PushException e) {
 			e.printStackTrace();
 		}
 	}
@@ -51,7 +66,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();
 		}
@@ -64,11 +80,11 @@
 		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();
+//		}
 
 	}
 
@@ -78,7 +94,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();
 		}
@@ -90,11 +107,11 @@
 		MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(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();
+//		}
 
 	}
 
@@ -111,7 +128,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();
 		}
@@ -123,12 +141,33 @@
 		MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 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