From e6cb7c27384f22b39ccee584028e23b56c30e9ee Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 07 三月 2019 15:01:22 +0800
Subject: [PATCH] 券推送调用
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
index e9af6f6..da68078 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -10,6 +10,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import com.yeshi.fanli.entity.bus.user.LostOrder;
+import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
@@ -22,6 +24,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.PidOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -77,6 +80,9 @@
@Resource
private LostOrderService lostOrderService;
+
+ @Resource
+ private OrderService orderService;
private void updateOrder(long startTime, long endTime) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -168,8 +174,20 @@
// 绉婚櫎浼氬憳杩愯惀ID涓庢笭閬撲笓灞炶鍗�
if (orderList.get(i).getAdPositionName().contains("浼氬憳杩愯惀")
|| orderList.get(i).getAdPositionName().contains("娓犻亾涓撳睘")) {
- orderList.remove(i);
- i--;
+ if (orderList.get(i).getAdPositionName().contains("浼氬憳杩愯惀")) {// 澶勭悊璁㈠崟鐢宠瘔
+ Order order = orderService.findOrderByOrderIdAndType(orderList.get(i).getOrderId(),
+ Order.ORDER_TYPE_TAOBAO);
+ if (order != null && order.getBeizhu().contains("琛ュ崟")) {// 涓嶆帓闄よˉ鍗曠殑鎯呭喌
+
+ } else {
+ orderList.remove(i);
+ i--;
+ break;
+ }
+ } else {
+ orderList.remove(i);
+ i--;
+ }
}
}
--
Gitblit v1.8.0