From faabdba4cdfc442d3dc5f06bd9ae9cc90d8161c3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 五月 2019 09:32:34 +0800
Subject: [PATCH] bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java
index 60170d8..0319260 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java
@@ -12,6 +12,7 @@
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.exception.msg.MsgOrderDetailException;
 import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
+import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
 import com.yeshi.fanli.util.Constant;
 
 @Service
@@ -20,12 +21,15 @@
 	@Resource
 	private MsgOrderDetailMapper msgOrderDetailMapper;
 
+	@Resource
+	private UserMsgReadStateService userMsgReadStateService;
+
 	@Override
 	public void addMsgOrderDetail(MsgOrderDetail detail) throws MsgOrderDetailException {
 		if (detail == null)
 			throw new MsgOrderDetailException(1, "娑堟伅涓虹┖");
-		if (detail.getOrderId() == null || detail.getGoodsCount() == null || detail.getType() == null
-				|| detail.getState() == null || detail.getPayMoney() == null || detail.getUser() == null)
+		if (detail.getOrderId() == null || detail.getType() == null
+				|| detail.getState() == null  || detail.getUser() == null)
 			throw new MsgOrderDetailException(2, "娑堟伅涓嶅畬鏁�");
 		MsgOrderDetail old = msgOrderDetailMapper.selectByUidAndOrderId(detail.getUser().getId(), detail.getOrderId());
 		if (old == null) {
@@ -44,6 +48,7 @@
 			update.setBeiZhu(detail.getBeiZhu());
 			msgOrderDetailMapper.updateByPrimaryKeySelective(update);
 		}
+		userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);
 	}
 
 	@Override
@@ -62,7 +67,7 @@
 	}
 
 	@Override
-	public void updateMsgOrderDetail(MsgOrderDetail detail) throws MsgOrderDetailException {
+	public void updateMsgOrderDetail(MsgOrderDetail detail, boolean needNotify) throws MsgOrderDetailException {
 		if (detail == null)
 			throw new MsgOrderDetailException(1, "娑堟伅涓虹┖");
 		if (detail.getOrderId() == null || detail.getState() == null || detail.getUser() == null)
@@ -76,12 +81,14 @@
 			return;
 
 		MsgOrderDetail update = new MsgOrderDetail();
-		update.setId(detail.getId());
+		update.setId(msg.getId());
 		update.setHongBaoMoney(detail.getHongBaoMoney());
 		update.setPayMoney(detail.getPayMoney());
 		if (detail.getState().intValue() != msg.getState()) {
 			update.setState(detail.getState());
 			update.setUpdateTime(new Date());
+			if (needNotify)
+				userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);
 		}
 		msgOrderDetailMapper.updateByPrimaryKeySelective(update);
 	}

--
Gitblit v1.8.0