采购在途 周转

data-common/src/main/resources/mybatis-config.xml

@@ -5,8 +5,8 @@
 <configuration>
 
     <!--<properties  resource="db-tj.properties"/>-->
-    <properties resource="db-dev.properties"/>
-    <!--    <properties resource="db-prod.properties"/>-->
+    <!--    <properties resource="db-dev.properties"/>-->
+    <properties resource="db-prod.properties"/>
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
     </settings>

data-mid/mid-calculate-transit/pom.xml

@@ -8,7 +8,9 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <properties>
+        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+    </properties>
     <artifactId>mid-calculate-transit</artifactId>
     <dependencies>
 
@@ -53,6 +55,31 @@
                     </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-mid-calculate-transit:${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-mid/mid-calculate-transit/src/main/docker/Dockerfile

+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ADD mid-calculate-transit-1.0-SNAPSHOT.jar app.jar
+RUN echo "Asia/Shanghai" > /etc/timezone
+
+ENTRYPOINT ["java","-Xms30m","-Xmx80m","-jar","/app.jar"]
+EXPOSE 8080

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -17,10 +17,7 @@ import com.bailuntec.service.AutoTurnoverService;
 import com.bailuntec.service.impl.AutoSalesServiceImpl;
 import com.bailuntec.service.impl.AutoTurnoverServiceImpl;
 import com.bailuntec.support.PointJob;
-import com.bailuntec.utils.DigestUtils;
-import com.bailuntec.utils.OkHttpUtil;
-import com.bailuntec.utils.PropertiesUtil;
-import com.bailuntec.utils.SessionUtil;
+import com.bailuntec.utils.*;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -793,7 +790,7 @@ public class AutoTurnoverJob extends PointJob {
 
             List<BigDecimal> salesDetails = param.stream().map(var -> {
                 try {
-                    String ss= var.trim();
+                    String ss = var.trim();
                     return new BigDecimal(ss);
                 } catch (Exception ex) {
                     throw ex;
@@ -816,15 +813,25 @@ public class AutoTurnoverJob extends PointJob {
             List<DcBaseWeekCoefficient> dcBaseWeekCoefficientList = dcBaseWeekCoefficientMapper.selectByDays(salesDetailItemList, dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
             List<SalesDayConfig> salesDayConfigMapperList = salesDayConfigMapper.selectByDays(salesDetailItemList, dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
 
-
-            Map<LocalDate, DcBaseWeekCoefficient> weekCoefficientMap = dcBaseWeekCoefficientList.stream().collect(Collectors.toMap(DcBaseWeekCoefficient::getWeekDate, dcBaseWeekCoefficient -> dcBaseWeekCoefficient));
-            Map<LocalDate, SalesDayConfig> salesDayConfigMap = salesDayConfigMapperList.stream().collect(Collectors.toMap(salesDayConfig -> salesDayConfig.getDate().toLocalDate(), salesDayConfig -> salesDayConfig));
-
-            salesDetailItemList.stream().peek(salesDetailItem -> {
-                salesDetailItem.setSalesDayConfig(salesDayConfigMap.get(salesDetailItem.getDate()).getSales());
-                salesDetailItem.setWeekCoefficient(new BigDecimal(weekCoefficientMap.get(salesDetailItem.getDate()).getCoefficient()));
-            })
-                    .forEach(SalesDetailItem::calcShowSales);
+            if (ListUtil.isNotEmpty(dcBaseWeekCoefficientList)) {
+                Map<LocalDate, DcBaseWeekCoefficient> weekCoefficientMap = dcBaseWeekCoefficientList.stream().collect(Collectors.toMap(DcBaseWeekCoefficient::getWeekDate, dcBaseWeekCoefficient -> dcBaseWeekCoefficient));
+                salesDetailItemList.forEach(salesDetailItem -> {
+                    DcBaseWeekCoefficient coefficient = weekCoefficientMap.get(salesDetailItem.getDate());
+                    if (coefficient != null) {
+                        salesDetailItem.setWeekCoefficient(new BigDecimal(coefficient.getCoefficient()));
+                    }
+                });
+            }
+            if (ListUtil.isNotEmpty(salesDayConfigMapperList)) {
+                Map<LocalDate, SalesDayConfig> salesDayConfigMap = salesDayConfigMapperList.stream().collect(Collectors.toMap(salesDayConfig -> salesDayConfig.getDate().toLocalDate(), salesDayConfig -> salesDayConfig));
+                salesDetailItemList.forEach(salesDetailItem -> {
+                    SalesDayConfig salesDayConfig = salesDayConfigMap.get(salesDetailItem.getDate());
+                    if (salesDayConfig != null) {
+                        salesDetailItem.setSalesDayConfig(salesDayConfig.getSales());
+                    }
+                });
+            }
+            salesDetailItemList.forEach(SalesDetailItem::calcShowSales);
 
             dcAutoTurnover.setSalesDetails(salesDetailItemList.stream().map(SalesDetailItem::getShowSales).map(BigDecimal::toString).collect(Collectors.joining(",")));