头程费用计算

亚马逊广告

data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdGenerateReportIdJob.java

@@ -46,10 +46,10 @@ public class AmazonAdGenerateReportIdJob implements SimpleJob {
             dcBaseCompanyAccountList.forEach(dcBaseCompanyAccount -> {
 
                 try {
+//
+                    LocalDateTime reportDate = LocalDateTime.now().minusDays(1).minusHours(12);
 
-//                    LocalDateTime reportDate = LocalDateTime.now().minusDays(1).minusHours(12);
-
-                    LocalDateTime reportDate  =LocalDateTime.of(2020,8,21,0,0);
+//                    LocalDateTime reportDate = LocalDateTime.of(2020, 8, 22, 0, 0);
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("reportDate", reportDate.format(DateTimeFormatter.ofPattern("yyyyMMdd")));
                     jsonObject.put("metrics", propertiesUtil.getPropertyAsString("METRICS"));

data-base/base-sync-company/src/test/java/CompanyTest.java

-import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.job.CompanyAccountSyncJob;
-import com.bailuntec.job.CompanyInfoSyncJob;
-import com.bailuntec.job.CompanyStaffSyncJob;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-
-public class CompanyTest {
-    @Test
-    public void test() {
-        CompanyInfoSyncJob skuSyncJob = new CompanyInfoSyncJob();
-        skuSyncJob.executeJob(null, new JobPointLog("", 0, 100, 1, 1, LocalDateTime.now().minusMonths(1), LocalDateTime.now().minusDays(29)));
-    }
-
-    @Test
-    public void test2() {
-        CompanyStaffSyncJob skuSyncJob = new CompanyStaffSyncJob();
-        skuSyncJob.executeJob(null, new JobPointLog("", 0, 100, 1, 1, LocalDateTime.now().minusMonths(1), LocalDateTime.now().minusDays(29)));
-    }
-
-    @Test
-    public void test3() {
-        CompanyAccountSyncJob skuSyncJob = new CompanyAccountSyncJob();
-        skuSyncJob.execute(null);
-    }
-
-}

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

@@ -139,5 +139,5 @@ public interface DcBaseCostFirstMapper {
      * @param pageOffset 分页参数
      * @return  未计算的基础头程费用
      */
-    List<DcBaseCostFirst> listUnCalc(@Param("pageStart") Integer pageStart, @Param("pageOffset") Integer pageOffset);
+    List<DcBaseCostFirst> dcBaseCostGroupList(@Param("pageStart") Integer pageStart, @Param("pageOffset") Integer pageOffset);
 }

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

@@ -834,7 +834,7 @@
 #                 and has_calculation = 0
               GROUP BY channel_order_id, transfer_order_id, box_id, warehouse_code) tb;
     </select>
-    <select id="listUnCalc" resultType="com.bailuntec.domain.entity.DcBaseCostFirst">
+    <select id="dcBaseCostGroupList" resultType="com.bailuntec.domain.entity.DcBaseCostFirst">
         SELECT t2.*
         from (
                  SELECT channel_order_id, transfer_order_id, box_id, warehouse_code
@@ -857,7 +857,6 @@
           and transfer_order_id = #{transferOrderId}
           and box_id = #{boxId}
           and warehouse_code = #{warehouseCode}
-#           and has_calculation = 0
     </update>
 
 

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

@@ -121,4 +121,12 @@ public interface DcMidCostFirstMapper {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     int upsertSelective(DcMidCostFirst record);
-}
+
\ No newline at end of file
+
+    /**
+     * 批量插入更细
+     *
+     * @param dcMidCostFirstList
+     */
+    void upsertBatch(@Param("lists") List<DcMidCostFirst> dcMidCostFirstList);
+}

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

@@ -129,6 +129,5 @@ public interface DcMidCostFirstOrderMapper {
 
     List<MidCostFirst> listSkuWarehouse(@Param("v1") int v1, @Param("v2") int v2);
 
-    int updateHasCalculation(MidCostFirst midCostFirst);
 
 }

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

@@ -577,28 +577,26 @@
         limit 1
     </select>
 
+
+    <!---->
     <select id="countSkuWarehouse" resultType="int">
         select count(*)
-        from (SELECT * FROM dc_mid_cost_first_order where has_calculation = 0 GROUP BY bailun_sku, warehouse_code) tb;
+        from (SELECT *
+              FROM dc_mid_cost_first_order
+              GROUP BY bailun_sku, warehouse_code) tb;
     </select>
 
+    <!---->
     <select id="listSkuWarehouse" resultType="com.bailuntec.domain.pojo.MidCostFirst">
         SELECT bailun_sku,
                warehouse_code,
                sum(cost_first) as total_cost_first,
                sum(quantity)   as total_count
         FROM dc_mid_cost_first_order
-        where has_calculation = 0
         GROUP BY bailun_sku, warehouse_code
-        order by id asc
+        order by id
         limit #{v1}, #{v2}
     </select>
 
-    <update id="updateHasCalculation">
-        update dc_mid_cost_first_order
-        set has_calculation = 1
-        where bailun_sku = #{bailunSku}
-          and warehouse_code = #{warehouseCode}
-    </update>
 
 </mapper>

data-mid/mid-calculate-cost-first/src/test/java/CostFirstTest.java

@@ -2,7 +2,6 @@ import com.bailuntec.domain.constant.Constant;
 import com.bailuntec.domain.entity.DcBaseSku;
 import com.bailuntec.domain.entity.DcMidCostFirst;
 import com.bailuntec.domain.entity.DcMidCostFirstConfig;
-import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.domain.example.DcBaseSkuExample;
 import com.bailuntec.domain.example.DcMidCostFirstExample;
 import com.bailuntec.domain.pojo.MidCostFirst;
@@ -37,7 +36,7 @@ public class CostFirstTest {
     @Test
     public void test() {
         CalculateCostFirstJob costFirstJob = new CalculateCostFirstJob();
-        costFirstJob.executeJob(null, new JobPointLog("dc-mid-calculate-cost-first", 1, 100, null, null, null, null));
+        costFirstJob.execute(null);
     }
 
     @Test

data-mid/mid-calculate-cost-first/src/test/java/com/bailuntec/job/CalculateCostFirstJobTest.java

@@ -20,6 +20,6 @@ class CalculateCostFirstJobTest {
         JobPointLog jobPointLog = new JobPointLog();
         jobPointLog.setPageSize(1000);
         jobPointLog.setPageIndex(1);
-        calculateCostFirstJob.executeJob(null, jobPointLog);
+        calculateCostFirstJob.execute(null);
     }
 }