From 788deca1b4a24f8a24e49c24f7d89975a1d74bbe Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 03 十一月 2019 23:31:25 +0800
Subject: [PATCH] 商城订单退款处理
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 61f3503..4c17f81 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -173,7 +173,7 @@
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
- // doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
+ doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
// doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
}
@@ -722,7 +722,6 @@
}
}
});
-
}
/**
@@ -744,6 +743,12 @@
HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
&& hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ // 鍒拌处閫侀噾甯�
+ fanliGetIntegral(hongBaoV2);
+ HongBaoRecieveCMQManager.getInstance()
+ .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
+
+ //杩斿埄涓嶈冻0.01鍏冮�侀噾甯�
if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘
// 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
List<Integer> typeList = new ArrayList<>();
@@ -792,8 +797,9 @@
if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
"yyyyMMdd")) {
if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 涓�绾ц繑鍒╁皬浜�0.01
-// integralTaskRecordService.firstRebateOrderRewardBoss(threeSale.getBoss().getId(),
-// hongBaoV2.getUserInfo().getId(), null);
+ integralTaskRecordService.firstRebateOrderRewardBoss(
+ threeSale.getBoss().getId(),
+ hongBaoV2.getUserInfo().getId(), null);
LogHelper.test("鑷喘-涓�绾х敤鎴�-" + threeSale.getBoss().getId()
+ "-hongBaoId:" + hongBaoV2.getId());
}
@@ -809,8 +815,9 @@
if (threeSale.getSucceedTime() > TimeUtil
.convertToTimeTemp("20190901", "yyyyMMdd")) {
if (secondLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 浜岀骇杩斿埄灏忎簬0.01
-// integralTaskRecordService.firstRebateOrderRewardBossSuper(threeSale.getBoss().getId(),
-// hongBaoV2.getUserInfo().getId(), null);
+ integralTaskRecordService.firstRebateOrderRewardBossSuper(
+ threeSale.getBoss().getId(),
+ hongBaoV2.getUserInfo().getId(), null);
LogHelper.test("鑷喘-浜岀骇鐢ㄦ埛-" + threeSale.getBoss().getId()
+ "-hongBaoId:" + hongBaoV2.getId());
}
@@ -864,8 +871,9 @@
if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
"yyyyMMdd")) {
if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 涓�绾ц繑鍒╁皬浜�0.01
-// integralTaskRecordService.firstSharerOrderRewardBoss(threeSale.getBoss().getId(),
-// hongBaoV2.getUserInfo().getId(), null);
+ integralTaskRecordService.firstSharerOrderRewardBoss(
+ threeSale.getBoss().getId(),
+ hongBaoV2.getUserInfo().getId(), null);
LogHelper.test("鍒嗕韩-涓�绾х敤鎴�-" + threeSale.getBoss().getId()
+ "-hongBaoId:" + hongBaoV2.getId());
}
@@ -874,9 +882,7 @@
}
}
}
- // HongBaoRecieveCMQManager.getInstance()
- // .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL,
- // key);
+
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -893,6 +899,21 @@
});
}
+ private void fanliGetIntegral(HongBaoV2 hongBaoV2) {
+ if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
+ && hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘璁㈠崟
+ integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId());
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璁㈠崟
+ integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId());
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾ч個璇�
+ integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId());
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇閭�璇�
+ integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId());
+ }
+ }
+ }
+
private boolean isFirstValidOrder(String orderId, int sourceType, Long uid) {
CommonOrder commonOrder = commonOrderService.selectLatestValidByUid(uid);
if (commonOrder != null && commonOrder.getOrderNo().equalsIgnoreCase(orderId)
--
Gitblit v1.8.0