From a8ba157aefdf0922037c197daba6b859bc30bf22 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 30 八月 2019 09:24:26 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java index 65bdfcf..0a3a029 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java @@ -713,11 +713,9 @@ minDate, maxDate); long weiQuanCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate); - long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, - minDate, maxDate); UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO, - (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date()); + (int) validCount, (int) weiQuanCount, invitemoney, new Date()); // 澧炲姞璧勯噾 userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail); @@ -809,7 +807,7 @@ minDate, maxDate); UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO, - (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date()); + (int) validCount, (int) weiQuanCount, sharemoney, new Date()); // 娣诲姞璧勯噾 userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail); -- Gitblit v1.8.0