From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOrderDetailServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 fd18baf..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
@@ -28,8 +28,8 @@
 	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) {

--
Gitblit v1.8.0