From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 13 四月 2020 10:04:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java index 00a7beb..14cc7c9 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/MsgOrderDetailServiceImpl.java @@ -34,8 +34,7 @@ public void addMsgOrderDetail(MsgOrderDetail detail, boolean needNotify) throws MsgOrderDetailException { if (detail == null) throw new MsgOrderDetailException(1, "娑堟伅涓虹┖"); - if (detail.getOrderId() == null || detail.getType() == null || detail.getState() == null - || detail.getUser() == null) + if (detail.getOrderId() == null || detail.getType() == null || detail.getUser() == null) throw new MsgOrderDetailException(2, "娑堟伅涓嶅畬鏁�"); // 閿佷綇璁㈠崟鍙� Jedis jedis = jedisPool.getResource(); @@ -67,7 +66,7 @@ } } finally { - jedisPool.returnResource(jedis); + jedis.close(); } } -- Gitblit v1.8.0