bug fix

data-base/base-sync-amazon-ad/src/main/docker/Dockerfile

@@ -4,5 +4,5 @@ ADD base-sync-amazon-ad-1.0-SNAPSHOT.jar app.jar
 
 RUN echo "Asia/Shanghai" > /etc/timezone
 
-ENTRYPOINT ["java","-Xms600m","-Xmx600m","-jar","/app.jar"]
+ENTRYPOINT ["java","-Xms2G","-Xmx2G","-jar","/app.jar"]
 EXPOSE 8080

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -26,7 +26,9 @@ public class OmsOrderTest {
 //        map.put("BailunLastUpdateTimeFrom", "2019-04-11 11:45:33");
 //        map.put("BailunLastUpdateTimeTo", "2019-04-11 16:17:03");
         //OriginOrderNo=112-7750508-3145827
-        map.put("OriginOrderNo","WS2020051105223211FC52AA");
+        map.put("OriginOrderNo", "353296395593-1198797722022");
+        //353295108454-1198385057022
+//        map.put("OriginOrderNo", "353295108454-1198385057022");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseTransExpectarrivaltime.java

+package com.bailuntec.domain.entity;
+
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+public class DcBaseTransExpectarrivaltime {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.id
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.bailun_sku
+     *
+     * @mbg.generated
+     */
+    private String bailunSku;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.warehouse_code
+     *
+     * @mbg.generated
+     */
+    private String warehouseCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime expectarrivaltime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.count
+     *
+     * @mbg.generated
+     */
+    private Integer count;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.transfer_order_id
+     *
+     * @mbg.generated
+     */
+    private String transferOrderId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_trans_expectarrivaltime.purchase_id
+     *
+     * @mbg.generated
+     */
+    private Integer purchaseId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", bailunSku=").append(bailunSku);
+        sb.append(", warehouseCode=").append(warehouseCode);
+        sb.append(", expectarrivaltime=").append(expectarrivaltime);
+        sb.append(", count=").append(count);
+        sb.append(", transferOrderId=").append(transferOrderId);
+        sb.append(", purchaseId=").append(purchaseId);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        DcBaseTransExpectarrivaltime other = (DcBaseTransExpectarrivaltime) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
+            && (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
+            && (this.getExpectarrivaltime() == null ? other.getExpectarrivaltime() == null : this.getExpectarrivaltime().equals(other.getExpectarrivaltime()))
+            && (this.getCount() == null ? other.getCount() == null : this.getCount().equals(other.getCount()))
+            && (this.getTransferOrderId() == null ? other.getTransferOrderId() == null : this.getTransferOrderId().equals(other.getTransferOrderId()))
+            && (this.getPurchaseId() == null ? other.getPurchaseId() == null : this.getPurchaseId().equals(other.getPurchaseId()));
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
+        result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
+        result = prime * result + ((getExpectarrivaltime() == null) ? 0 : getExpectarrivaltime().hashCode());
+        result = prime * result + ((getCount() == null) ? 0 : getCount().hashCode());
+        result = prime * result + ((getTransferOrderId() == null) ? 0 : getTransferOrderId().hashCode());
+        result = prime * result + ((getPurchaseId() == null) ? 0 : getPurchaseId().hashCode());
+        return result;
+    }
+}
\ No newline at end of file

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

@@ -3714,6 +3714,7 @@
           AND bailun_sku = #{bailunSku}
           AND website = #{webSite}
           AND cost_platform_fee > 0
+        order by order_update_time desc
         limit 1
     </select>
 

data-common/src/main/java/com/bailuntec/mapper/DcBaseStockMapper.java

@@ -127,18 +127,26 @@ public interface DcBaseStockMapper {
     /**
      *
      */
+    // 慢查询
+    @Deprecated
     void supplementOrderSku();
 
     /**
      *
      */
+    // 慢查询
+    @Deprecated
     void supplementTransitSku();
 
     /**
      *
      */
+    // 慢查询
+    @Deprecated
     void supplementPurchaseSku();
 
+    // 慢查询
+    @Deprecated
     void insertDailyStock();
 
     List<DcBaseStock> listStockById(@Param("v1") int v1, @Param("v2") int v2);
@@ -218,7 +226,11 @@ public interface DcBaseStockMapper {
      * @param pageOffset      pageOffset
      * @return 补充晚上定时任务的数据
      */
-    List<DcBaseStock> increment(@Param("shardingContext") ShardingContext shardingContext, @Param("v1") LocalDateTime v1, @Param("v2") LocalDateTime v2, @Param("pageStart") int pageStart, @Param("pageOffset") int pageOffset);
+    List<DcBaseStock> increment(@Param("shardingContext") ShardingContext shardingContext,
+                                @Param("v1") LocalDateTime v1,
+                                @Param("v2") LocalDateTime v2,
+                                @Param("pageStart") int pageStart,
+                                @Param("pageOffset") int pageOffset);
 
 
     List<DcBaseStock> listNeNormal(ShardingContext shardingContext, int i, Integer pageSize);

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

@@ -1179,6 +1179,7 @@
         WHERE tbs.bailun_sku IS NULL;
     </insert>
 
+
     <insert id="insertDailyStock">
         INSERT INTO dc_daily_stock (`bailun_sku`,
                                     `warehouse_code`,
@@ -1393,36 +1394,21 @@
     </select>
 
     <select id="countIncrement" resultType="java.lang.Long">
-        SELECT count(t1.id)
-        FROM dc_base_stock AS t1
-        WHERE (
-                    bailun_sku_warehouse_code IN (SELECT CONCAT(bailun_sku, warehouse_code)
-                                                  FROM dc_base_oms_sku
-                                                  WHERE gmt_create &gt;= #{v1})
-                OR (bailun_sku_warehouse_code IN (SELECT CONCAT(bailun_sku, warehouse_code)
-                                                  FROM dc_base_oms_sku
-                                                  WHERE gmt_create &gt;= #{v2}
-#                                                     AND bailun_sku_quantity_ordered > bailun_sku_quantity_picked
-            ))
-            )
-          and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
+        SELECT count(id)
+        from (SELECT t1.id, t1.bailun_sku, t1.warehouse_code
+              from dc_base_oms_sku_30 t1
+              where t1.gmt_create &gt;= #{v2}
+                and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
+              GROUP BY t1.bailun_sku, t1.warehouse_code) a
     </select>
 
     <select id="increment" resultType="com.bailuntec.domain.entity.DcBaseStock">
-        SELECT t1.*
-        FROM dc_base_stock AS t1
-        WHERE (
-                    bailun_sku_warehouse_code IN (SELECT CONCAT(bailun_sku, warehouse_code)
-                                                  FROM dc_base_oms_sku
-                                                  WHERE gmt_create &gt;= #{v1})
-                OR (bailun_sku_warehouse_code IN (SELECT CONCAT(bailun_sku, warehouse_code)
-                                                  FROM dc_base_oms_sku
-                                                  WHERE gmt_create &gt;= #{v2}
-#                                                     AND bailun_sku_quantity_ordered > bailun_sku_quantity_picked
-            ))
-            )
+        SELECT t1.id, t1.bailun_sku, t1.warehouse_code
+        from dc_base_oms_sku_30 t1
+        where t1.gmt_create &gt;= #{v2}
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
-        limit #{pageStart}, #{pageOffset};
+        GROUP BY t1.bailun_sku, t1.warehouse_code
+        limit #{pageStart},#{pageOffset};
     </select>
 
     <select id="listSpec" resultType="com.bailuntec.domain.entity.DcBaseStock">

data-common/src/main/java/com/bailuntec/mapper/DcBaseTransExpectarrivaltimeMapper.java

+package com.bailuntec.mapper;
+
+import com.bailuntec.domain.entity.DcBaseTransExpectarrivaltime;
+import com.bailuntec.domain.example.DcBaseTransExpectarrivaltimeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DcBaseTransExpectarrivaltimeMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    long countByExample(DcBaseTransExpectarrivaltimeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(DcBaseTransExpectarrivaltimeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int insert(DcBaseTransExpectarrivaltime record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int insertSelective(DcBaseTransExpectarrivaltime record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DcBaseTransExpectarrivaltime selectOneByExample(DcBaseTransExpectarrivaltimeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    List<DcBaseTransExpectarrivaltime> selectByExample(DcBaseTransExpectarrivaltimeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    DcBaseTransExpectarrivaltime selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") DcBaseTransExpectarrivaltime record, @Param("example") DcBaseTransExpectarrivaltimeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") DcBaseTransExpectarrivaltime record, @Param("example") DcBaseTransExpectarrivaltimeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(DcBaseTransExpectarrivaltime record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(DcBaseTransExpectarrivaltime record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    int upsert(DcBaseTransExpectarrivaltime record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_trans_expectarrivaltime
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    int upsertSelective(DcBaseTransExpectarrivaltime record);
+}
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/DcDailySalesMapper.java

@@ -123,5 +123,6 @@ public interface DcDailySalesMapper {
     int upsertSelective(DcDailySales record);
 
 
+    //todo 慢查询优化
     void calculateSales();
 }

data-common/src/main/java/com/bailuntec/mapper/DcDailyTransitFromMapper.java

@@ -125,6 +125,8 @@ public interface DcDailyTransitFromMapper {
      */
     int upsertSelective(DcDailyTransitFrom record);
 
+    // 慢查询
+    @Deprecated
     List<TransferTransitQuantity> selectQuantityTransferTransitFrom();
 
     int calculateTransferTransitFrom(@Param("list") List<TransferTransitQuantity> list, @Param("localDate") LocalDate localDate);
@@ -138,4 +140,4 @@ public interface DcDailyTransitFromMapper {
     int updateSourceWarehouseName(@Param("localDate") LocalDate localDate);
 
     int updateSkuUnitPrice(@Param("localDate") LocalDate localDate);
-}
+}
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/DcMidTransitMapper.java

@@ -133,10 +133,13 @@ public interface DcMidTransitMapper {
 
     void calculateOutStock(@Param("list") List<OutStockQuantity> list, @Param("localDateTime") LocalDateTime localDateTime);
 
+    // 慢查询
     void insertMidDailyTransit();
 
+    //todo 慢查询
     List<OutStockQuantity> selectQuantityOutStock();
 
+    //todo 慢查询优化
     List<PurchaseTransitQuantity> selectQuantityPurchaseTransit();
 
     List<TransferTransitQuantity> selectQuantityTransferTransit();
@@ -162,4 +165,6 @@ public interface DcMidTransitMapper {
     void updateSkuUnitPrice();
 
     void selectUnShipped();
+
+    void deleteMidDailyTransit();
 }

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

@@ -152,6 +152,7 @@
             <include refid="Example_Where_Clause"/>
         </if>
     </delete>
+
     <insert id="insert" parameterType="com.bailuntec.domain.entity.DcMidTransit">
         <!--
           WARNING - @mbg.generated
@@ -731,7 +732,13 @@
 
     <insert id="calculatePurchaseTransit">
         insert into dc_mid_transit(bailun_sku, warehouse_code,
-        quantity_purchase,amount_purchase_transit,quantity_land_purchase,quantity_ocean_purchase,quantity_air_purchase,quantity_railway_purchase,gmt_purchase_modified)
+        quantity_purchase,
+        amount_purchase_transit,
+        quantity_land_purchase,
+        quantity_ocean_purchase,
+        quantity_air_purchase,
+        quantity_railway_purchase,
+        gmt_purchase_modified)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -768,6 +775,12 @@
         values(gmt_out_stock_modified), quantity_out_stock_aliexpress = values(quantity_out_stock_aliexpress)
     </insert>
 
+    <delete id="deleteMidDailyTransit">
+        delete
+        from dc_daily_transit
+        where record_time = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+    </delete>
+
     <insert id="insertMidDailyTransit">
         INSERT into dc_daily_transit (`bailun_sku`,
                                       `warehouse_code`,
@@ -810,9 +823,6 @@
                                 else 0 end)              as aliexpress_quantity
                  FROM dc_base_oms_sku_30
                  WHERE bailun_order_status = 'Handling'
-                   and bailun_interception_status in ('None', 'Failed')
-                   and warehouse_code != ''
-                   and platform_type != 'FBA'
                    and company_id = 1
                    and has_delete = 0
                    and has_scalp = 0
@@ -822,8 +832,10 @@
                    and has_innersale = 0
                    and paid_time >= '2019-03-01 12:00:00'
                    and bailun_sku_quantity_ordered > bailun_sku_quantity_shipped
-                 GROUP BY bailun_sku,
-                          warehouse_code
+                   and bailun_interception_status in ('None', 'Failed')
+                   and warehouse_code != ''
+                   and platform_type != 'FBA'
+                 GROUP BY bailun_sku, warehouse_code
              ) t1
                  INNER JOIN dc_base_stock t2 ON t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
                  LEFT JOIN dc_auto_jit_inventory t3

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

@@ -546,6 +546,7 @@
         </foreach>
         and t2.id is not null
     </select>
+
     <select id="selectTarget" resultType="com.bailuntec.domain.entity.SalesDayConfig">
         select DISTINCT bailun_sku,warehouse_code from sales_day_config
     </select>

data-common/src/main/resources/init.properties

-table-name=dc_auto_fastest_storage
+table-name=dc_base_trans_expectarrivaltime
 

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/src/main/java/com/bailuntec/job/DailyTransitJob.java

@@ -12,6 +12,7 @@ public class DailyTransitJob extends PointJob {
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
         try {
             DcMidTransitMapper mapper = SessionUtil.getSession().getMapper(DcMidTransitMapper.class);
+            mapper.deleteMidDailyTransit();
             mapper.insertMidDailyTransit();
             mapper.updateSkuUnitPrice();
         } catch (Exception e) {

data-mid/mid-daily-stock/pom.xml

@@ -9,9 +9,12 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>mid-daily-stock</artifactId>
 
+    <properties>
+        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+    </properties>
+
     <dependencies>
 
         <dependency>
@@ -26,6 +29,32 @@
     </dependencies>
     <build>
         <plugins>
+
+            <!-- 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>
+
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

data-mid/mid-daily-stock/src/main/docker/Dockerfile

+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ADD mid-daily-stock-1.0-SNAPSHOT.jar mid-daily-stock-1.0-SNAPSHOT.jar
+RUN echo "Asia/Shanghai" > /etc/timezone
+
+ENTRYPOINT ["java","-Xms100m","-Xmx180m","-jar","/usr/app/data-mid/mid-daily-stock/target/mid-daily-stock-1.0-SNAPSHOT.jar"]
+EXPOSE 8080

data-mid/mid-daily-stock/src/main/java/com/bailuntec/Application.java

@@ -27,7 +27,7 @@ public class Application {
     private static final String EVENT_RDB_STORAGE_PASSWORD = propertiesUtil.getPropertyAsString("EVENT_RDB_STORAGE_PASSWORD");
     public static void main(String[] args) {
         new JobScheduler(createRegistryCenter(), createJobConfiguration1(),createJobEventConfiguration(), new DailyStockJobListener()).init();
-        new JobScheduler(createRegistryCenter(), createJobConfiguration2()).init();
+//        new JobScheduler(createRegistryCenter(), createJobConfiguration2()).init();
     }
 
     private static CoordinatorRegistryCenter createRegistryCenter() {

data-mid/mid-daily-stock/src/main/java/com/bailuntec/job/DailyStockJob.java

 package com.bailuntec.job;
 
-import com.bailuntec.domain.entity.DcBaseStock;
 import com.bailuntec.mapper.DcBaseStockMapper;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;
 import lombok.extern.slf4j.Slf4j;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
 @Slf4j
 public class DailyStockJob implements SimpleJob {
     @Override
     public void execute(ShardingContext shardingContext) {
         try {
+            // 慢查询优化 fixed
             DcBaseStockMapper mapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
+
             mapper.insertDailyStock();
         } catch (Exception e) {
             e.printStackTrace();

data-parent/dataSources/bdf29a78-39c8-40a0-90e0-d8734a92b991/storage_v2/_src_/schema/bailun_datacenter.g-OGdQ.meta

+#n:bailun_datacenter
\ No newline at end of file

data-parent/dataSources/bdf29a78-39c8-40a0-90e0-d8734a92b991/storage_v2/_src_/schema/information_schema.FNRwLQ.meta

+#n:information_schema
+!<md> [null, 0, null, null, -2147483648, -2147483648]

data-show/show-auto-turnover/src/main/java/com/bailuntec/service/impl/AutoSalesServiceImpl.java

@@ -84,6 +84,9 @@ public class AutoSalesServiceImpl implements AutoSalesService {
         try {
             DcAutoSalesMapper dcAutoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
             int i = dcAutoSalesMapper.updateByExampleSelective(dcAutoSales, DcAutoSalesExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoSales.getBailunSku()).andWarehouseCodeEqualTo(dcAutoSales.getWarehouseCode()).example());
+            if (dcAutoSales.getDetails() == null) {
+                dcAutoSales.setDetails("");
+            }
             if (i == 0) {
                 dcAutoSalesMapper.insertSelective(dcAutoSales);
             }

data-show/show-auto-turnover/src/main/resources/job.properties

@@ -10,9 +10,9 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
 
-JOB_NAME=show-auto-turnover23
+JOB_NAME=show-auto-turnover28
 JOB_CRON=0 0 3 * * ?
-#JOB_CRON=0 20 21 * * ?
+#JOB_CRON=0 0 10 * * ?
 SHARDING_TOTAL_COUNT=8
 
 
@@ -20,7 +20,7 @@ JOB_NAME_NE_NORMAL=show-auto-turnover-ne-normal
 JOB_CRON_NE_NORMAL=0 0 1 ? * MON
 
 
-JOB_NAME_INCREMENT=show-auto-turnover-increment
+JOB_NAME_INCREMENT=show-auto-turnover-increment3
 JOB_CRON_INCREMENT=0 0 14 * * ?
 
 SHARDING_TOTAL_COUNT_INCREMENT=8

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -170,13 +170,14 @@ public class AutoTurnoverTest {
 
 
     }
+    //LM-EO-007，MMDUSFBA
 
     @Test
     public void testXX2() {
         DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
                 .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
-                        .andBailunSkuEqualTo("N-S-BT")
-                        .andWarehouseCodeEqualTo("ESFBABLEM")
+                        .andBailunSkuEqualTo("947077901")
+                        .andWarehouseCodeEqualTo("GZBLWH")
                         .example());
 
         try {

data-show/show-auto-turnover/src/test/java/com/bailuntec/job/AutoTurnoverJobTest.java

@@ -57,7 +57,7 @@ public class AutoTurnoverJobTest {
         jobPointLog.setPageSize(1000);
 
         AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
-        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 0),
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "INCREMENT", new HashMap<>()), 0),
                 jobPointLog);
     }