From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 4e86ce6..78ae16f 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
@@ -54,6 +54,7 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
@@ -138,6 +139,9 @@
@Resource
private UserMoneyService userMoneyService;
+
+ @Resource
+ private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
@@ -579,8 +583,8 @@
if (drawBack == null) {// 杩樻湭鎵ｆ
try {
taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());
- taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());
+ taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
} catch (TaoBaoWeiQuanException e) {
try {
LogHelper.errorDetailInfo(e, null, "璁㈠崟鍙�:" + order.getOrderId());
@@ -923,15 +927,21 @@
orderMapper.insertSelective(order);
oldOrder = order;
} else {
- UserExtraTaoBaoInfo info = null;
+
+ Long targetUid = null;
if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
&& !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
- info = userExtraTaoBaoInfoService.getByRelationId(orderList.get(0).getRelationId());
+ targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());
+
} else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {
- info = userExtraTaoBaoInfoService.getBySpecialId(orderList.get(0).getSpecialId());
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
+ .getBySpecialId(orderList.get(0).getSpecialId());
+ if (info != null && info.getUser() != null)
+ targetUid = info.getUser().getId();
}
- if (info != null && info.getUser() != null) {
- uid = info.getUser().getId();
+
+ if (targetUid != null) {
+ uid = targetUid;
// 鎻掑叆鍒癘rder涓�
// 娣诲姞鍒拌鍗曚腑鍘�
Order order = new Order();
--
Gitblit v1.8.0