From 79896552fa31dea34403e64076431a0e2277e50f Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期日, 28 六月 2020 16:47:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsRecordServiceImpl.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsRecordServiceImpl.java index e595628..ecb098e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsRecordServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsRecordServiceImpl.java @@ -28,12 +28,11 @@ throw new ParamsException(1, "鍙傛暟涓嶅畬鏁�"); // 鍒ゆ柇鏄惁瀛樺湪 - TeamDividentsRecord old = teamDividentsRecordMapper.selectByUidAndDayForUpdate(record.getUid(), - record.getDay()); + TeamDividentsRecord old = teamDividentsRecordMapper.selectByUidAndDayAndTypeForUpdate(record.getUid(), + record.getDay(),record.getType()); if (old != null) throw new TeamDividentsRecordException(TeamDividentsRecordException.CODE_EXIST, "璁板綍宸插瓨鍦�"); // 鍔犲叆璁板綍 - if (record.getCreateTime() == null) record.setCreateTime(new Date()); teamDividentsRecordMapper.insertSelective(record); -- Gitblit v1.8.0