From b2cff7a3e9d5cebacef4866c5993e0be89ff5b00 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 27 九月 2019 14:36:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index fe0000f..491b41c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -172,11 +172,10 @@
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
- doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
-// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
-// doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
+ doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
+ // doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
+ doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
}
-
}
/**
@@ -855,15 +854,15 @@
integralTaskRecordService.firstRebateOrderRewardBoss(boss.getId(),
order.getUserInfo().getId(), null);
}
- }
- boss = threeSaleSerivce.getBoss(boss.getId());
- if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
- if (hongBaoMoney.get(boss.getId()) == null
- || hongBaoMoney.get(boss.getId()).compareTo(new BigDecimal("0")) <= 0) {
- // 琛ュ伩閲戝竵2绾�
- integralTaskRecordService.firstRebateOrderRewardBossSuper(boss.getId(),
- order.getUserInfo().getId(), null);
+ boss = threeSaleSerivce.getBoss(boss.getId());
+ if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
+ if (hongBaoMoney.get(boss.getId()) == null || hongBaoMoney.get(boss.getId())
+ .compareTo(new BigDecimal("0")) <= 0) {
+ // 琛ュ伩閲戝竵2绾�
+ integralTaskRecordService.firstRebateOrderRewardBossSuper(boss.getId(),
+ order.getUserInfo().getId(), null);
+ }
}
}
}
--
Gitblit v1.8.0