From 17e98d7bcc27072f97976d24eb504abb02914891 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:20:14 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 52 +++++++++++++++-------------------------------------
1 files changed, 15 insertions(+), 37 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 926553a..9dd281f 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
@@ -73,7 +73,6 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
-import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
@@ -167,8 +166,6 @@
@Resource
private HongBaoV2AddManager hongBaoV2AddManager;
- @Resource
- private OrderTeamRewardService orderTeamRewardService;
/**
* 鏄惁鏄垎浜鍗�
@@ -218,15 +215,13 @@
String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())) {
- // 澶勭悊楗夸簡涔堣鍗�
- elmeOrderMap.put(orderId, list);
- // TODO 澶勭悊楗夸簡涔堣鍗�
- // if(list.get(0).getCreateTime()){
- // //涓嬪崟鏃堕棿澶т簬涓�涓畾鍊煎氨杩涘叆娣樺疂璁㈠崟
- // //鑾峰彇relationId
- //
- //
- // }
+ // 楗夸簡涔堣鍗曞紑濮嬪綊鍏ュ埌娣樺疂璁㈠崟
+ if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > TimeUtil
+ .convertToTimeTemp("2020-04-15", "yyyy-MM-dd")) {
+ fanliOrderMap.put(orderId, list);
+ } else {
+ elmeOrderMap.put(orderId, list);
+ }
} else {
if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())
|| pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 璁剧疆娓犻亾ID褰撳仛浼氬憳杩愯惀ID鐨勪綅缃甀D
@@ -677,9 +672,16 @@
if (oldOrder == null) {
Long targetUid = null;
if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
- && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
+ && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊闈炶繑鍒╁晢鍝佸簱鐨勫晢鍝�
targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());
+ } else if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)
+ && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊楗夸簡涔堢殑璁㈠崟
+ UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService
+ .getByRelationId(orderList.get(0).getRelationId());
+ if (extraInfo != null) {
+ targetUid = extraInfo.getUser().getId();
+ }
} else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {
UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
.getBySpecialId(orderList.get(0).getSpecialId());
@@ -1346,30 +1348,6 @@
}
}
return false;
- }
-
- @Override
- public void fanliOrderTeamReward() {
- Date time = new Date();
- long count = orderTeamRewardService.countCanSettleUid(time);
- int pageSize = 500;
- int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- List<Long> uidList = new ArrayList<>();
- for (int i = 0; i < page; i++) {
- List<Long> list = orderTeamRewardService.listCanSettleUid(time, i + 1, pageSize);
- if (list != null && list.size() > 0)
- uidList.addAll(list);
- }
- // 娣诲姞鍒伴槦鍒�
- if (uidList != null)
- for (Long uid : uidList)
- if (!Constant.IS_TEST)
- CMQManager.getInstance().addFanLiOrderTeamRewardMsg(uid);
- }
-
- @Override
- public void fanliOrderTeamReward(Long uid) throws OrderMoneySettleException {
- orderMoneySettleService.orderTeamRewardSettle(uid);
}
}
--
Gitblit v1.8.0