# 更新

data-base/base-sync-oms-order/pom.xml

@@ -12,6 +12,13 @@
     <artifactId>base-sync-oms-order</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.bailuntec</groupId>

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -370,6 +370,8 @@ public class OrderSyncJob extends PointJob {
                                     BigDecimal amountPrepaid = skuSalesPrice.multiply(quantityPrepared).multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).subtract(skuCostPlatformFeePreparedRMB);
                                     dcBaseOmsSku.setAmountPrepaid(amountPrepaid.compareTo(BigDecimal.ZERO) == 1 ? amountPrepaid.divide(quantityPrepared, 5, RoundingMode.HALF_EVEN) : BigDecimal.ZERO);
                                     totalAmountPrepaid = totalAmountPrepaid.add(dcBaseOmsSku.getAmountPrepaid());
+                                } else {
+                                    dcBaseOmsSku.setAmountPrepaid(BigDecimal.ZERO);
                                 }
                                 //促销费-原币种
                                 BigDecimal skuCostPromotion = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getCostPromotion()).setScale(5, RoundingMode.HALF_EVEN);

data-base/base-sync-oms-order/src/main/resources/job.properties

@@ -10,9 +10,10 @@ EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
-#JOB_NAME=base-sync-oms-order-coroutine
+
 
 JOB_NAME=base-sync-oms-order
+#JOB_NAME=base-sync-oms-order-coroutine
 JOB_CRON=0/1 * * * * ? *
 
 JOB_NAME30=base-sync-oms-skus30

data-base/base-sync-transfer/pom.xml

@@ -2,16 +2,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
         <artifactId>data-base</artifactId>
         <groupId>com.bailuntec</groupId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
 
     <artifactId>base-sync-transfer</artifactId>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.bailuntec</groupId>
@@ -21,29 +29,56 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
+                    <archive>
+                        <manifest>
                             <mainClass>com.bailuntec.Application</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>repackage</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- docker的maven插件，官网：https://github.com/spotify/docker-maven-plugin -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <configuration>
+                    <!--镜像名称：镜像版本-->
+                    <skipDockerBuild>false</skipDockerBuild>
+                    <imageName>ccr.ccs.tencentyun.com/blt.data.center/dc-base-sync-transfer:${maven.build.timestamp}
+                    </imageName>
+                    <dockerDirectory>src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <serverId>bailuntec-docker</serverId>
+                </configuration>
+            </plugin>
         </plugins>
 
         <resources>

data-base/base-sync-transfer/src/main/docker/Dockerfile

+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ADD base-sync-transfer-1.0-SNAPSHOT.jar app.jar
+
+RUN echo "Asia/Shanghai" > /etc/timezone
+
+ENTRYPOINT ["java","-Xms160m","-Xmx160m","-jar","/app.jar"]
+EXPOSE 8080