Merge remote-tracking branch 'origin/master'

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

@@ -131,6 +131,8 @@ public interface DcBaseFinanceEbayMapper {
     // CalculateEbayItemJob  start
     List<DcBaseFinanceEbayItemDto> selectEbayList(JobPointLog jobPointLog);
 
+    List<DcBaseFinanceEbayItemDto> selectEbayList1(JobPointLog jobPointLog);
+
     BigDecimal selectSkuPrice(@Param("skuCode") String skuCode);
     // CalculateEbayItemJob  end
 

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

@@ -1060,6 +1060,14 @@
       limit ${pageIndex * pageSize} , #{pageSize}
   </select>
 
+  <select id="selectEbayList1" resultMap="BaseResultMap2">
+      select * from dc_base_finance_ebay
+      where bj_date &gt;= #{startTime} and bj_date &lt; #{endTime}
+      and id &gt;= #{type}
+      order by id asc
+      limit ${pageIndex * pageSize} , #{pageSize}
+  </select>
+
   <select id="selectSkuPrice" resultType="java.math.BigDecimal">
     select unit_price from dc_base_sku where bailun_sku = #{skuCode}
   </select>

data-mid/mid-calculate-item/src/main/java/com/bailuntec/job/CalculateEbayItemJob.java

@@ -5,6 +5,7 @@ import com.bailuntec.domain.constant.EbaySkuMappingRoot;
 import com.bailuntec.domain.dto.DcBaseFinanceEbayItemDto;
 import com.bailuntec.domain.entity.*;
 import com.bailuntec.domain.example.DcBaseFinanceEbayExample;
+import com.bailuntec.domain.example.DcBaseFinanceEbayItemExample;
 import com.bailuntec.mapper.DcBaseFinanceEbayItemMapper;
 import com.bailuntec.mapper.DcBaseFinanceEbayMapper;
 import com.bailuntec.support.PointJob;
@@ -34,8 +35,16 @@ public class CalculateEbayItemJob extends PointJob {
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
         long countEbayFee;
         try{
+            DcBaseFinanceEbayItemMapper dcBaseFinanceEbayItemMapper = SessionUtil.getSession().getMapper(DcBaseFinanceEbayItemMapper.class);
+            dcBaseFinanceEbayItemMapper.deleteByExample(DcBaseFinanceEbayItemExample.newAndCreateCriteria().andBjDateGreaterThanOrEqualTo(jobPointLog.getStartTime()).andBjDateLessThan(jobPointLog.getEndTime()).example());
             DcBaseFinanceEbayMapper dcBaseFinanceEbayMapper = SessionUtil.getSession().getMapper(DcBaseFinanceEbayMapper.class);
-            countEbayFee = dcBaseFinanceEbayMapper.countByExample(DcBaseFinanceEbayExample.newAndCreateCriteria().andBjDateGreaterThanOrEqualTo(jobPointLog.getStartTime()).andBjDateLessThan(jobPointLog.getEndTime()).example());
+            if (StringUtils.isBlank(shardingContext.getJobParameter())) {
+                countEbayFee = dcBaseFinanceEbayMapper.countByExample(DcBaseFinanceEbayExample.newAndCreateCriteria().andBjDateGreaterThanOrEqualTo(jobPointLog.getStartTime()).andBjDateLessThan(jobPointLog.getEndTime()).example());
+            }else {
+                Integer jobParameter = Integer.parseInt(shardingContext.getJobParameter());
+                countEbayFee = dcBaseFinanceEbayMapper.countByExample(DcBaseFinanceEbayExample.newAndCreateCriteria().andBjDateGreaterThanOrEqualTo(jobPointLog.getStartTime()).andBjDateLessThan(jobPointLog.getEndTime()).andIdGreaterThanOrEqualTo(jobParameter).example());
+            }
+
         }catch (Exception e){
             e.printStackTrace();
             throw new RuntimeException("MYBATIS操作DB失败", e);
@@ -49,7 +58,16 @@ public class CalculateEbayItemJob extends PointJob {
             List<DcBaseFinanceEbayItemDto> dcBaseFinanceEbayItemDtoList;
             try{
                 DcBaseFinanceEbayMapper dcBaseFinanceEbayMapper = SessionUtil.getSession().getMapper(DcBaseFinanceEbayMapper.class);
-                dcBaseFinanceEbayItemDtoList = dcBaseFinanceEbayMapper.selectEbayList(jobPointLog);
+                if(StringUtils.isBlank(shardingContext.getJobParameter())){
+                    dcBaseFinanceEbayItemDtoList = dcBaseFinanceEbayMapper.selectEbayList(jobPointLog);
+                }else{
+                    if(jobPointLog.getType() != 0) {
+
+                    }
+                    jobPointLog.setType(Integer.parseInt(shardingContext.getJobParameter()));
+                    dcBaseFinanceEbayItemDtoList = dcBaseFinanceEbayMapper.selectEbayList1(jobPointLog);
+                }
+
                 for(DcBaseFinanceEbayItemDto dcBaseFinanceEbayItemDto : dcBaseFinanceEbayItemDtoList) {
 
                     List<String> list = new ArrayList<>();