Merge remote-tracking branch 'origin/master'

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

@@ -132,6 +132,8 @@ public interface DcBaseStockMapper {
 
     List<DcBaseStock> listStockById(@Param("v1") int v1, @Param("v2") int v2);
 
+    List<DcBaseStock> listStockWarehouseById(@Param("v1") int v1, @Param("v2") int v2, @Param("warehouseCode") String warehouseCode);
+
     List<DcBaseStock> listParameterStockById(@Param("jobParameter")String jobParameter,@Param("v1") int v1, @Param("v2") int v2);
 
     List<DcBaseStock> listWarehouseStockById(@Param("warehouseCode")String warehouseCode,@Param("v1") int v1, @Param("v2") int v2);

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

@@ -1232,7 +1232,11 @@
   </select>
 
   <select id="listStockById" resultType="com.bailuntec.domain.entity.DcBaseStock">
-    SELECT *  FROM dc_base_stock where warehouse_code = 'GZBLWH'  order by id asc limit #{v1}, #{v2}
+    SELECT *  FROM dc_base_stock order by id asc limit #{v1}, #{v2}
+  </select>
+
+  <select id="listStockWarehouseById" resultType="com.bailuntec.domain.entity.DcBaseStock">
+    SELECT *  FROM dc_base_stock where warehouse_code = #{warehouseCode} order by id asc limit #{v1}, #{v2}
   </select>
 
   <select id="listParameterStockById" resultType="com.bailuntec.domain.entity.DcBaseStock">

data-mid/mid-calculate-sales/src/main/java/com/bailuntec/job/CalculateWeekJob.java

@@ -27,8 +27,13 @@ public class CalculateWeekJob extends PointJob {
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
 
         try{
+            long count = 0;
             DcBaseStockMapper baseStockMapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
-            long count = baseStockMapper.countByExample(DcBaseStockExample.newAndCreateCriteria().andWarehouseCodeEqualTo("GZBLWH").example());
+            if (StringUtils.isBlank(shardingContext.getJobParameter())) {
+                count = baseStockMapper.countByExample(DcBaseStockExample.newAndCreateCriteria().example());
+            } else {
+                count = baseStockMapper.countByExample(DcBaseStockExample.newAndCreateCriteria().andWarehouseCodeEqualTo(shardingContext.getJobParameter()).example());
+            }
             int totalPage = (int)(count % jobPointLog.getPageSize() == 0 ? count/jobPointLog.getPageSize() : count/jobPointLog.getPageSize() + 1);
             do{
                 List<DcBaseStock> dcBaseStockList = null;//分页查SKU_仓库
@@ -37,7 +42,11 @@ public class CalculateWeekJob extends PointJob {
                 }
                 try {
                     DcBaseStockMapper baseStockMapperFor = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
+                    if (StringUtils.isBlank(shardingContext.getJobParameter())) {
                         dcBaseStockList = baseStockMapperFor.listStockById(jobPointLog.getPageIndex()*jobPointLog.getPageSize(), jobPointLog.getPageSize());
+                    }else{
+                        dcBaseStockList = baseStockMapperFor.listStockWarehouseById(jobPointLog.getPageIndex()*jobPointLog.getPageSize(), jobPointLog.getPageSize(), shardingContext.getJobParameter());
+                    }
                     DcAutoSalesMapper autoSalesMapper = null;
                     if (dcBaseStockList != null && dcBaseStockList.size() > 0) {
                         for (DcBaseStock dcBaseStock : dcBaseStockList) {