# update

data-base/base-sync-purchase-details/pom.xml

@@ -66,7 +66,9 @@
                 <configuration>
                     <!--镜像名称：镜像版本-->
                     <skipDockerBuild>false</skipDockerBuild>
-                    <imageName>ccr.ccs.tencentyun.com/blt.data.center/dc-base-sync-purchase-details:${maven.build.timestamp}</imageName>
+                    <imageName>
+                        ccr.ccs.tencentyun.com/blt.data.center/dc-base-sync-purchase-details:${maven.build.timestamp}
+                    </imageName>
                     <dockerDirectory>src/main/docker</dockerDirectory>
                     <resources>
                         <resource>

data-base/base-sync-purchase-details/src/main/java/com/bailuntec/job/SyncPurchaseDetailsJob.java

@@ -17,8 +17,8 @@ import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
@@ -63,7 +63,7 @@ public class SyncPurchaseDetailsJob extends PointJob {
                 }
             }
             long endTime = System.currentTimeMillis();
-            System.out.println("调用数据时间："+(endTime - startTime)+"ms");
+            System.out.println("调用数据时间：" + (endTime - startTime) + "ms");
             if (StringUtils.isNotBlank(purchaseStr)) {
                 JSONObject jsonObject = JSON.parseObject(purchaseStr);
                 if (jsonObject != null) {
@@ -78,7 +78,7 @@ public class SyncPurchaseDetailsJob extends PointJob {
                                 log.warn(purchaseDetail.getBailunSku() + "&" + purchaseDetail.getPurchaseId());
                                 DcBasePurchaseDetails dcBasePurchaseDetails = new DcBasePurchaseDetails();
                                 try {
-                                    BeanUtils.copyProperties(dcBasePurchaseDetails, purchaseDetail);
+                                    BeanUtils.copyProperties(purchaseDetail, dcBasePurchaseDetails);
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                     throw new RuntimeException("BeanUtils.copyProperties采购单sku详细信息异常");

data-base/base-sync-purchase-details/src/test/java/SyncPurchaseDetailsTest.java

@@ -12,12 +12,13 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 
 public class SyncPurchaseDetailsTest {
+
     @Test
     public void test() {
         SyncPurchaseDetailsJob syncPurchaseDetailsJob = new SyncPurchaseDetailsJob();
         syncPurchaseDetailsJob.executeJob(null, new JobPointLog("base-purchase-details", 1, 1000, 0, 1,
-                LocalDateTime.of(2020, 03, 01, 0, 0),
-                LocalDateTime.of(2020, 03, 15, 0, 0)));
+                LocalDateTime.of(2020, 3, 1, 0, 0),
+                LocalDateTime.of(2020, 3, 15, 0, 0)));
     }
 
     @Test

data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml

@@ -3744,7 +3744,7 @@
         SELECT (SELECT coalesce(sum(ifnull(tt2.sales, tt1.bailun_sku_quantity_ordered)), 0)
                 from (
                          select coalesce(sum(t1.bailun_sku_quantity_ordered), 0) as bailun_sku_quantity_ordered,
-                                DATE_FORMAT(paid_time, '%y%m%d')                 as paid_date
+                                DATE_FORMAT(paid_time, '%Y-%m-%d')               as paid_date
                          from dc_base_oms_sku t1
                          where t1.paid_time >= #{lowerTime}
                            and t1.paid_time <= #{upperTime}
@@ -3759,7 +3759,7 @@
                            and t1.bailun_order_status != 'Canceled'
                            and t1.platform_order_type != '手工单'
                          GROUP BY DATE_FORMAT(paid_time, '%y%m%d')) tt1
-                         LEFT JOIN dc_aims_transfer_warehouse_sales tt2 on tt1.paid_date = tt2.date)
+                         LEFT JOIN dc_aims_transfer_warehouse_sales tt2 on tt1.paid_date = tt2.date_str)
                    / #{days}
     </select>
 

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-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -257,7 +257,7 @@ public class AutoTurnoverTest {
     public void testXX2() {
         DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
                 .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
-                        .andBailunSkuEqualTo("944870001")
+                        .andBailunSkuEqualTo("951386201")
                         .andWarehouseCodeEqualTo("GB4PXBL")
                         .example());