Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java

@@ -15,6 +15,9 @@
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;

import com.yeshi.fanli.util.Constant;



import redis.clients.jedis.Jedis;

import redis.clients.jedis.JedisPool;



@Service

public class MsgOrderDetailServiceImpl implements MsgOrderDetailService {



@@ -24,31 +27,49 @@
   @Resource

   private UserMsgReadStateService userMsgReadStateService;



   @Resource

   private JedisPool jedisPool;



   @Override

   public void addMsgOrderDetail(MsgOrderDetail detail) throws MsgOrderDetailException {

   public void addMsgOrderDetail(MsgOrderDetail detail, boolean needNotify) 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) {

         detail.setCreateTime(new Date());

         detail.setUpdateTime(new Date());

         detail.setRead(false);

         msgOrderDetailMapper.insertSelective(detail);

      } else {

         MsgOrderDetail update = new MsgOrderDetail();

         update.setId(old.getId());

         update.setUpdateTime(new Date());

         update.setState(detail.getState());

         update.setPayMoney(detail.getPayMoney());

         update.setHongBaoMoney(detail.getHongBaoMoney());

         update.setRead(false);

         update.setBeiZhu(detail.getBeiZhu());

         msgOrderDetailMapper.updateByPrimaryKeySelective(update);

      // 锁住订单号

      Jedis jedis = jedisPool.getResource();

      try {

         String key = "rs-order-" + detail.getOrderId();

         if (jedis.setnx(key, "1") > 0) {

            jedis.expire(key, 60);

            MsgOrderDetail old = msgOrderDetailMapper.selectByUidAndOrderId(detail.getUser().getId(),

                  detail.getOrderId());

            if (old == null) {

               detail.setCreateTime(new Date());

               detail.setUpdateTime(new Date());

               detail.setRead(false);

               msgOrderDetailMapper.insertSelective(detail);

            } else {

               MsgOrderDetail update = new MsgOrderDetail();

               update.setId(old.getId());

               update.setUpdateTime(new Date());

               update.setState(detail.getState());

               update.setPayMoney(detail.getPayMoney());

               update.setHongBaoMoney(detail.getHongBaoMoney());

               update.setRead(false);

               update.setBeiZhu(detail.getBeiZhu());

               msgOrderDetailMapper.updateByPrimaryKeySelective(update);

            }

            if (needNotify)

               userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);

            jedis.del(key);

         }



      } finally {

         jedisPool.returnResource(jedis);

      }

      userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);



   }



   @Override

@@ -86,7 +107,7 @@
      update.setPayMoney(detail.getPayMoney());

      if (detail.getState().intValue() != msg.getState()) {

         update.setState(detail.getState());

         update.setUpdateTime(new Date());

         // update.setUpdateTime(new Date());

         if (needNotify)

            userMsgReadStateService.addOrderMsgUnReadCount(detail.getUser().getId(), 1);

      }