Merge branch 'master' of ssh://10.10.100.21/source/uas_schedular

build.gradle

@@ -37,9 +37,9 @@ repositories {
     mavenLocal()
     maven { url "http://repo.spring.io/libs-milestone" }
     maven { url "http://repo.spring.io/libs-release" }
-	maven { url "http://10.10.101.21:8081/artifactory/libs-release-local" }
-	maven { url "http://10.10.101.21:8081/artifactory/ext-release-local" }
-    maven { url "http://10.10.101.21:8081/artifactory/libs-snapshot-local" }
+	maven { url "http://10.10.100.21:8081/artifactory/libs-release-local" }
+	maven { url "http://10.10.100.21:8081/artifactory/ext-release-local" }
+    maven { url "http://10.10.100.21:8081/artifactory/libs-snapshot-local" }
     maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
     mavenCentral()
 }
@@ -75,7 +75,7 @@ docker {
 uploadArchives {
     repositories {
         mavenDeployer {
-            repository(url: "http://10.10.101.21:8081/artifactory/libs-release-local") {
+            repository(url: "http://10.10.100.21:8081/artifactory/libs-release-local") {
                 authentication(userName: "yingp", password: "111111")
             }
         }

src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

@@ -432,8 +432,8 @@ public class ProductTask extends AbstractTask {
                     continue;
                 }
 
-                //初始状态、待支付、代收款状态订单不同步
-                if (order.getStatus() == 141000 || order.getStatus() == 141010 || order.getStatus() == 141020){
+                //初始状态、待支付、代收款、已取消状态订单不同步
+                if (order.getStatus() == 141000 || order.getStatus() == 141010 || order.getStatus() == 141020 || order.getStatus() == 141095){
                     continue;
                 }
                 String mallStatus = "";