From d21a2d9757a8d57f0fa1d0097709c764924ff08e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
index ffde3b6..dba80bb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
@@ -321,8 +321,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void shareSettleTB(Long uid) throws OrderMoneySettleException {
- Date maxPregetTime = new Date();
+ public void shareSettleTB(Long uid,Date maxPregetTime) throws OrderMoneySettleException {
/**
* 澶勭悊鍒嗕韩璧�
*/
@@ -368,8 +367,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void shareSettleJD(Long uid) throws OrderMoneySettleException {
- Date maxPregetTime = new Date();
+ public void shareSettleJD(Long uid,Date maxPregetTime) throws OrderMoneySettleException {
/**
* 澶勭悊鍒嗕韩璧�
*/
@@ -410,8 +408,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void shareSettlePDD(Long uid) throws OrderMoneySettleException {
- Date maxPregetTime = new Date();
+ public void shareSettlePDD(Long uid,Date maxPregetTime) throws OrderMoneySettleException {
/**
* 澶勭悊鍒嗕韩璧�
*/
--
Gitblit v1.8.0