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

yujian

2019-08-16 e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0

 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,6 +27,9 @@
   @Resource

   private UserMsgReadStateService userMsgReadStateService;



   @Resource

   private JedisPool jedisPool;



   @Override

   public void addMsgOrderDetail(MsgOrderDetail detail, boolean needNotify) throws MsgOrderDetailException {

      if (detail == null)

@@ -31,7 +37,14 @@
      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());

      // 锁住订单号

      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());

@@ -50,6 +63,13 @@
      }

      if (needNotify)

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

            jedis.del(key);

         }



      } finally {

         jedisPool.returnResource(jedis);

      }



   }



   @Override