From ca7aa881987169d3d0202fe85d9f47d225111f33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 18:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 7a1aa75..2b29151 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
@@ -9,8 +9,10 @@
import com.yeshi.fanli.dao.mybatis.msg.MsgOrderDetailMapper;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+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
@@ -18,6 +20,9 @@
@Resource
private MsgOrderDetailMapper msgOrderDetailMapper;
+
+ @Resource
+ private UserMsgReadStateService userMsgReadStateService;
@Override
public void addMsgOrderDetail(MsgOrderDetail detail) throws MsgOrderDetailException {
@@ -43,7 +48,7 @@
update.setBeiZhu(detail.getBeiZhu());
msgOrderDetailMapper.updateByPrimaryKeySelective(update);
}
-
+ userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);
}
@Override
@@ -61,4 +66,35 @@
msgOrderDetailMapper.setMsgReadByUid(uid);
}
+ @Override
+ public void updateMsgOrderDetail(MsgOrderDetail detail) throws MsgOrderDetailException {
+ if (detail == null)
+ throw new MsgOrderDetailException(1, "娑堟伅涓虹┖");
+ if (detail.getOrderId() == null || detail.getState() == null || detail.getUser() == null)
+ throw new MsgOrderDetailException(2, "娑堟伅涓嶅畬鏁�");
+
+ MsgOrderDetail msg = msgOrderDetailMapper.selectByUidAndOrderId(detail.getUser().getId(), detail.getOrderId());
+ if (msg == null)
+ return;
+
+ if (msg.getState() == CommonOrder.STATE_WQ)
+ return;
+
+ MsgOrderDetail update = new MsgOrderDetail();
+ 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());
+ userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);
+ }
+ msgOrderDetailMapper.updateByPrimaryKeySelective(update);
+ }
+
+ @Override
+ public List<MsgOrderDetail> listMsgOrderByOrderId(String orderId) {
+ return msgOrderDetailMapper.listByOrderId(orderId);
+ }
+
}
--
Gitblit v1.8.0