From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
index 800251b..6c37c85 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
@@ -9,23 +9,14 @@
import javax.annotation.Resource;
import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
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;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.TaoBaoOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.DataMonitorService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;
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;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
@@ -34,7 +25,6 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.taobao.TaoBao110Util;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@@ -45,18 +35,6 @@
public UpdateCommonOrderJob() {
System.out.println("鍒濆鍖�:UpdateOrderJob");
}
-
- @Resource
- private OrderItemServcie orderItemServcie;
-
- @Resource
- private ThreeSaleGiftService threeSaleGiftService;
-
- @Resource
- private HongBaoService hongBaoService;
-
- @Resource
- private PidOrderService pidOrderService;
@Resource
private OrderProcessService orderProcessService;
@@ -215,7 +193,7 @@
- (1000 * 60 * 60 * 24L * (90 - pos));
long endTime = startTime + 1000 * 60 * 60 * 24L;
LogHelper.orderInfo("姝e湪鎵ц璁㈠崟鐖彇...");
-// updateOrder(startTime, endTime);
+ // updateOrder(startTime, endTime);
}
// 娣樺疂鎺ㄥ箍璁㈠崟 姣忛殧30绉掓墽琛屼竴娆�
--
Gitblit v1.8.0