From 6a2e44aab53743d1595cdded27d85a8f67f3270c Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期二, 29 一月 2019 00:30:37 +0800
Subject: [PATCH] 爬单规则修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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 6b7878e..bb0e8e5 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
@@ -36,6 +36,7 @@
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.CommonOrder;
@@ -67,6 +68,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.RedisManager;
@@ -162,6 +164,9 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -175,18 +180,25 @@
String orderId = its.next();
if (orders.get(orderId) != null && orders.get(orderId).size() > 0) {
List<TaoBaoOrder> list = orders.get(orderId);
- String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
- list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
- PidUser pidUser = pidUserMapper.selectByPid(pid);
- if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
- // List<PidOrder> pidOrderList = new ArrayList<>();
- // for (TaoBaoOrder order : list) {
- // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
- // }
- // sharePidOrderMap.put(orderId, pidOrderList);
+
+ if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {
shareOrderMap.put(orderId, list);
- } else {// 鏅�氳繑鍒╄鍗�
+ } else if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())) {
fanliOrderMap.put(orderId, list);
+ } else {
+ String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
+ list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
+ PidUser pidUser = pidUserMapper.selectByPid(pid);
+ if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
+ // List<PidOrder> pidOrderList = new ArrayList<>();
+ // for (TaoBaoOrder order : list) {
+ // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
+ // }
+ // sharePidOrderMap.put(orderId, pidOrderList);
+ shareOrderMap.put(orderId, list);
+ } else {// 鏅�氳繑鍒╄鍗�
+ fanliOrderMap.put(orderId, list);
+ }
}
}
}
@@ -881,6 +893,25 @@
// 鍔犲叆鍒拌鍗曡〃
orderMapper.insertSelective(order);
oldOrder = order;
+ } else {
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
+ .getBySpecialId(orderList.get(0).getSpecialId());
+ if (info != null && info.getUser() != null) {
+ uid = info.getUser().getId();
+ // 鎻掑叆鍒癘rder涓�
+ // 娣诲姞鍒拌鍗曚腑鍘�
+ Order order = new Order();
+ order.setBeizhu("PID杩斿埄璁㈠崟");
+ order.setCreatetime(System.currentTimeMillis());
+ order.setOrderId(orderId);
+ order.setOrderType(1);
+ order.setState(Order.STATE_YIZHIFU);
+ order.setUserInfo(new UserInfo(uid));
+ order.setVersion(2);
+ // 鍔犲叆鍒拌鍗曡〃
+ orderMapper.insertSelective(order);
+ oldOrder = order;
+ }
}
} else {
uid = oldOrder.getUserInfo().getId();
@@ -941,6 +972,11 @@
PidUser pidUser = pidUserMapper.selectByPid(pid);
if (pidUser != null)
uid = pidUser.getUid();
+ else {
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByRelationId(orderList.get(0).getRelationId());
+ if (info != null && info.getUser() != null)
+ uid = info.getUser().getId();
+ }
// 灏氭湭鎵惧埌鍜孭ID瀵瑰簲鐨勭敤鎴�
if (uid == null)
--
Gitblit v1.8.0