From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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 5cfbe2f..23e8c47 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
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.service.manger.order.TeamRewardManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -161,6 +162,9 @@
@Resource
private HongBaoV2AddManager hongBaoV2AddManager;
+
+ @Resource
+ private TeamRewardManager teamRewardManager;
/**
* 鏄惁鏄垎浜鍗�
@@ -546,7 +550,7 @@
new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));
// 澶勭悊缁存潈鎴愬姛浣嗘槸宸插埌璐︾殑璁㈠崟
- if (order.getJieSuanTime().getTime() > TimeUtil.convertToTimeTemp("2019-01-01", "yyyy-MM-dd")) {// 缁撶畻鏃堕棿鍦�2鏈�1鍙风殑寮�濮嬪鐞嗗凡鍒拌处浣嗘槸缁存潈鐨�
+ if (order.getJieSuanTime().getTime() > TimeUtil.convertToTimeTemp("2019-01-01", "yyyy-MM-dd")) {// 缁撶畻鏃堕棿鍦�1鏈�1鍙风殑寮�濮嬪鐞嗗凡鍒拌处浣嗘槸缁存潈鐨�
CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
order.getOrderItemId());
if (commonOrder != null && !StringUtil.isNullOrEmpty(commonOrder.getTradeId())) {
@@ -560,8 +564,8 @@
try {
taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(), true);
taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());
- taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
- } catch (TaoBaoWeiQuanException e) {
+ teamRewardManager.weiQuan(order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, order.getOrderItemId());
+ } catch (Exception e) {
try {
LogHelper.errorDetailInfo(e, "鍒拌处鍚庡鐞嗙淮鏉冩墸娆惧嚭閿�", "璁㈠崟鍙�:" + order.getOrderId());
} catch (Exception e1) {
@@ -569,21 +573,14 @@
}
}
} else {
- // 鏌ヨ瀛愮孩鍖呮槸鍚﹀凡鍒拌处
- List<HongBaoV2> children = hongBaoV2Service
- .listChildrenById(hongBaoOrder.getHongBaoV2().getId());
- for (HongBaoV2 hongBaoV2 : children) {
- if (hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {
- try {
- taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
- } catch (TaoBaoWeiQuanException e) {
- try {
- LogHelper.errorDetailInfo(e, "鍒拌处鍚庡鐞嗙淮鏉冩墸娆惧嚭閿�", "璁㈠崟鍙�:" + order.getOrderId());
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- break;
+ try {
+// taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
+ teamRewardManager.weiQuan(order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, order.getOrderItemId());
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e, "鍒拌处鍚庡鐞嗙淮鏉冩墸娆惧嚭閿�", "璁㈠崟鍙�:" + order.getOrderId());
+ } catch (Exception e1) {
+ e1.printStackTrace();
}
}
}
@@ -664,7 +661,7 @@
}
@Override
- // @Transactional(rollbackFor = Exception.class)
+// @Transactional(rollbackFor = Exception.class)
public void fanliPreInvaite(Long uid, Date maxPreGetTime) {
// 閭�璇疯禋鍒拌处
try {
@@ -1666,6 +1663,7 @@
// 杩斿埄鍒拌处
}
+
/**
* 娣诲姞绾㈠寘涓庝簨鍔℃秷鎭�
*
@@ -1722,4 +1720,19 @@
return false;
}
+
+ @Override
+ public void invalidTaoBaoOrder(String tradeId) {
+ TaoBaoOrder taoBaoOrder = taoBaoOrderService.selectByTradeId(tradeId);
+ //璁㈠崟浠樻鍜岃鍗曟垚鍔熺殑鐘舵�佹墠鍏佽澶辨晥
+ if (taoBaoOrder != null && ("璁㈠崟浠樻".equalsIgnoreCase(taoBaoOrder.getOrderState()) || "璁㈠崟鎴愬姛".equalsIgnoreCase(taoBaoOrder.getOrderState()))) {
+ TaoBaoOrder update = new TaoBaoOrder();
+ update.setId(taoBaoOrder.getId());
+ update.setLatestUpdateTime(new Date());
+ update.setOrderState("璁㈠崟澶辨晥");
+ taoBaoOrderService.updateSelectiveByPrimaryKey(update);
+ CMQManager.getInstance().addTaoBaoOrderMsg(taoBaoOrder.getOrderId());
+ }
+ }
+
}
--
Gitblit v1.8.0