同步数据修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -115,7 +115,7 @@ public class MQTask implements InitializingBean {
 	 * @throws Exception
 	 */
 	 @Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
-	//@Scheduled(cron = "0 0/2 * * * ?")//每三分钟执行一次
+	//@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncEfastOrderList() throws Exception {
 		logger.info("---------------- 批量同步百胜订单开始 ---------------");
@@ -125,16 +125,6 @@ public class MQTask implements InitializingBean {
 		String date = "";
 		synchronized (lock) {
 			String configParameter = sysConfigService.getSysConfig(1);
-
-			//根据时间排序查询订单信息
-//			List<SalesOrder> orderList = salesOrderService.listSalesOrder(new SalesOrder());
-//			if (orderList != null && orderList.size() > 0) {
-//				SalesOrder salesOrder = orderList.get(0);
-//				date = salesOrder.getSalesCreateTime().toString();
-//			} else {
-//				date = "2016-04-01";
-//			}
-			String endTime = configParameter;
 			do {
 				//批量获取百胜订单信息
 				JSONObject obj = null;
@@ -160,10 +150,11 @@ public class MQTask implements InitializingBean {
 	}
 
 	/**
-	 * 同步百胜订单状态等信息
+	 * 同步百胜订单状态等信息----客诉系统
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+//	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncEfastOrderStatus() throws Exception {
 		int pageNo = 1;
@@ -179,29 +170,16 @@ public class MQTask implements InitializingBean {
 			SalesOrder order = new SalesOrder();
 			Calendar date = Calendar.getInstance();
 
-			Relu relu = new Relu();
-			relu.setrId(6);
-			relu.setrIsStatus(1);
 			//获取同步百胜订单的开始时间
-			List<Relu> reluList = sysService.ListSysRelu(relu);
-			if (reluList == null || reluList.size() == 0) {
-				relu.setrNum(7);
-				relu.setrText("0");
-			} else {
-				relu = reluList.get(0);
-			}
-			if (Integer.parseInt(relu.getrText()) > 0) {
-				date.setTime(beginDate);
-				date.set(Calendar.DATE, date.get(Calendar.DATE) - (int) relu.getrNum());
-				order.setSalesCreateTime(format.parse(format.format(date.getTime())));
-			} else {
-				order.setSalesCreateTime(format.parse("2016-04-01"));
-				relu.setrText("1");
-				//从头开始同步，只同步一次
-				//sysService.updateRelu(relu);
-			}
+			String configParameter = sysConfigService.getSysConfig(2);  //获取客诉订单同步百胜订单状态时间间隔
+			date.setTime(beginDate);
+			date.set(Calendar.DATE, date.get(Calendar.DATE) - Integer.valueOf(configParameter));
+			order.setStartDate(format.parse(format.format(date.getTime())));
+			order.setSalesCreateTime(format.parse(format.format(date.getTime())));
+
 			//根据创建时间获取订单信息
 			List<SalesOrder> orderlist = salesOrderService.listSalesOrder(order);
+			logger.info("需要同步订单状态的订单有：" + orderlist.size() + "个；");
 			if (orderlist == null || orderlist.size() == 0) {
 				return;
 			}