调整定时拉取订单揽件信息的功能

watero-rst-core/src/main/java/com.iamberry.rst.core/tools/KuaiDi100.java

@@ -442,11 +442,13 @@ public class KuaiDi100 {
     public JSONObject selectCourierCompany2(String code,String num) {
         num = num.toLowerCase();
         JSONObject json = null;
-        if(code.toLowerCase().equals("sf") || code.toLowerCase().equals("shunfeng")){
+        boolean flag = code.toLowerCase().equals("sf") || code.toLowerCase().equals("shunfeng");
+        flag = true;
+        if(flag){
             KuaiDi100 kuaidi = new KuaiDi100();
             String result = null;
             try {
-                result = kuaidi.selectCourierSF("SF", num);
+                result = kuaidi.selectCourierSF(code, num);
                 if(result != null){
                     SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     JSONObject jn = JSONObject.fromObject(result);
@@ -459,7 +461,6 @@ public class KuaiDi100 {
                     for(int i=context.size()-1;i > 0;i--){
                         JSONObject job = context.getJSONObject(i);
                         HashMap<String,String> map = new HashMap<>();
-
                         map.put("time",String.valueOf((sf.parse(job.getString("AcceptTime")).getTime()) /1000));
                         map.put("desc",job.getString("AcceptStation"));
                         list.add(map);

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

@@ -46,7 +46,7 @@ import static com.iamberry.rst.util.SmsConfig.*;
 @Lazy(false)
 public class MQTask implements InitializingBean {
 
-	private static Logger logger = LoggerFactory.getLogger(SysController.class);
+	private static Logger logger = LoggerFactory.getLogger(MQTask.class);
 
 	@Autowired
 	private MessageService messageService;
@@ -599,14 +599,6 @@ public class MQTask implements InitializingBean {
 		if(salesOrderList != null && salesOrderList.size()>0){
 			logger.info("------------查询订单揽件时间 - 需要查询揽件订单数量："+ salesOrderList.size() +"-----------");
 			for (SalesOrder salesOrder:salesOrderList) {
-				try {
-					if(numSellpNum > 30){
-						numSellpNum =0;
-						Thread.sleep(60000);
-					}
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
 				LogisticsInfo log = new LogisticsInfo();
 				log.setLogisticsRstCode(salesOrder.getSalesPostFirm());
 				List<LogisticsInfo> listlog = logisticsInfoService.getLogisticsInfoList(log);