From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderServiceImpl.java
index 537a989..9162659 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderServiceImpl.java
@@ -31,7 +31,7 @@
TeamDividentsSourceOrder sourceOrder = selectByOrderNoSourceType(order.getOrderNo(), order.getSourceType());
if (sourceOrder != null)
- throw new TeamDividentsSourceOrderException(1, "璁㈠崟宸插瓨鍦�");
+ throw new TeamDividentsSourceOrderException(TeamDividentsSourceOrderException.CODE_EXIST, "璁㈠崟宸插瓨鍦�");
if (order.getCreateTime() == null)
order.setCreateTime(new Date());
@@ -108,7 +108,7 @@
@Override
public TeamDividentsSourceOrder selectByOrderNoSourceType(String orderNo, int sourceType) {
- return teamDividentsSourceOrderMapper.selectByOrderNoSourceType(orderNo, sourceType);
+ return teamDividentsSourceOrderMapper.selectByOrderNoAndSourceType(orderNo, sourceType);
}
--
Gitblit v1.8.0