Commit cfb640a1 by huluobin

# update

parent bf2afb75
...@@ -92,13 +92,13 @@ ...@@ -92,13 +92,13 @@
from dc_base_oms_sku from dc_base_oms_sku
where bailun_sku = #{bailunSku} where bailun_sku = #{bailunSku}
and warehouse_code = #{warehouseCode} and warehouse_code = #{warehouseCode}
order by create_time asc order by id asc
limit 1; limit 1;
</select> </select>
<select id="avgOrderCount30" resultType="java.math.BigDecimal"> <select id="avgOrderCount30" resultType="java.math.BigDecimal">
select count(DISTINCT bailun_order_id) / 30 select count(DISTINCT bailun_order_id) / 30
from dc_base_oms_sku from dc_base_oms_sku_30
where bailun_sku = #{bailunSku} where bailun_sku = #{bailunSku}
and warehouse_code = #{warehouseCode} and warehouse_code = #{warehouseCode}
and create_time >= date_sub(now(), interval 31 day) and create_time >= date_sub(now(), interval 31 day)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!--<properties resource="db-tj.properties"/>--> <!--<properties resource="db-tj.properties"/>-->
<!-- <properties resource="db-dev.properties"/>--> <!-- <properties resource="db-dev.properties"/>-->
<properties resource="db-prod.properties"/> <properties resource="db-prod.properties"/>
<settings> <settings>
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
</settings> </settings>
......
...@@ -10,9 +10,9 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf ...@@ -10,9 +10,9 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
ZOOKEEPER_SERVER=172.31.255.120:2181 ZOOKEEPER_SERVER=172.31.255.120:2181
NAME_SPACE=data-center NAME_SPACE=data-center
JOB_NAME=show-auto-turnover47 JOB_NAME=show-auto-turnover48
#JOB_CRON=0 0 3 * * ? #JOB_CRON=0 0 3 * * ?
JOB_CRON=0 50 14 * * ? JOB_CRON=0 50 15 * * ?
SHARDING_TOTAL_COUNT=8 SHARDING_TOTAL_COUNT=8
JOB_NAME_NE_NORMAL=show-auto-turnover-ne-normal JOB_NAME_NE_NORMAL=show-auto-turnover-ne-normal
......
...@@ -127,7 +127,7 @@ public class AutoTurnoverTest { ...@@ -127,7 +127,7 @@ public class AutoTurnoverTest {
HashMap<Integer, String> map = new HashMap<>(); HashMap<Integer, String> map = new HashMap<>();
map.put(1, ""); map.put(1, "");
ShardingContext shardingContext = new ShardingContext(new ShardingContexts("", "", 1, "INCREMENT", map), 0); ShardingContext shardingContext = new ShardingContext(new ShardingContexts("", "", 1, "INCREMENT", map), 0);
JobPointLog jobPointLog = new JobPointLog("", 1, 400, 1, 1, LocalDateTime.now().minusSeconds(1), LocalDateTime.now()); JobPointLog jobPointLog = new JobPointLog("", 6, 400, 1, 1, LocalDateTime.now().minusSeconds(1), LocalDateTime.now());
autoTurnoverJob.executeJob(shardingContext, jobPointLog); autoTurnoverJob.executeJob(shardingContext, jobPointLog);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment