xian 3 gadi atpakaļ
vecāks
revīzija
d7058e7d7a

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

@@ -191,7 +191,7 @@ public class MQTask implements InitializingBean {
 	/**
 	 * 同步拉取京东自发订单的发货单号(10分钟一次)
 	 */
-	@Scheduled(fixedDelay = 600_000, initialDelay = 60_000)
+	@Scheduled(fixedDelay = 1800_000, initialDelay = 120_000)
 	public void syncXytOrderPostNum(){
 		if (isDebug) {
 			logger.info("debug模式,无法运行正式任务");
@@ -212,7 +212,7 @@ public class MQTask implements InitializingBean {
 	/**
 	 * 同步拉取京东自发订单的发货单号(10分钟一次)
 	 */
-	@Scheduled(fixedDelay = 600_000, initialDelay = 60_000)
+	@Scheduled(fixedDelay = 1800_000, initialDelay = 180_000)
 	public void syncXytOrderByJd(){
 		if (isDebug) {
 			logger.info("debug模式,无法运行正式任务");

+ 4 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -543,7 +543,10 @@ public class AwaitSendController {
         String addr = "";
         if (salesOrderInfo.getSalesAddressTel().contains("转")) {
             tel = salesOrderInfo.getSalesAddressTel().split("转")[0];
-            addr = "[" + salesOrderInfo.getSalesAddressTel() + "]";
+            addr = "[派送请拨打" + salesOrderInfo.getSalesAddressTel() + "]";
+        } else if (salesOrderInfo.getSalesAddressTel().contains("-")) {
+            tel = salesOrderInfo.getSalesAddressTel().split("-")[0];
+            addr = "[派送请拨打" + salesOrderInfo.getSalesAddressTel() + "]";
         } else {
             tel = salesOrderInfo.getSalesAddressTel();
         }