未发货数新增订单号

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

@@ -143,9 +143,9 @@ public interface DcMidTransitMapper {
     @Select("select @@tx_isolation;")
     String printTransactionLevel();
 
-    void updateOldTransferToZero(@Param("transferModified") LocalDateTime transferModified);
-    void updateOldPurchaseToZero(@Param("purchaseModified") LocalDateTime purchaseModified);
-    void updateOldOutStockToZero(@Param("outStockModified") LocalDateTime outStockModified);
+    void updateOldTransferToZero(@Param("transferModified") String transferModified);
+    void updateOldPurchaseToZero(@Param("purchaseModified") String purchaseModified);
+    void updateOldOutStockToZero(@Param("outStockModified") String outStockModified);
 
     LocalDateTime selectMaxOutStockModified();
     LocalDateTime selectMaxTransferModified();

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

@@ -836,16 +836,18 @@
   </select>
 
   <insert id="calculateUnshipped">
-    insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_unshipped,gmt_unshipped_modified)
+    insert into dc_mid_transit(bailun_sku, warehouse_code, quantity_unshipped,gmt_unshipped_modified,bailun_order_ids)
     SELECT
     t1.bailun_sku,
     t1.warehouse_code,
 		t1.bailun_sku_quantity_ordered - t1.bailun_sku_quantity_shipped,
-    CURRENT_TIMESTAMP
+    CURRENT_TIMESTAMP,
+  t1.bailun_order_ids
     FROM
     (
     SELECT
-    bailun_sku,warehouse_code,SUM(bailun_sku_quantity_ordered) AS bailun_sku_quantity_ordered,SUM(bailun_sku_quantity_shipped) AS bailun_sku_quantity_shipped
+    bailun_sku,warehouse_code,SUM(bailun_sku_quantity_ordered) AS bailun_sku_quantity_ordered,SUM(bailun_sku_quantity_shipped) AS bailun_sku_quantity_shipped,
+  GROUP_CONCAT(DISTINCT bailun_order_id) as 'bailun_order_ids'
     FROM
     dc_base_oms_sku
     WHERE
@@ -864,6 +866,6 @@
     warehouse_code
     ) t1
 	WHERE (t1.bailun_sku_quantity_ordered - t1.bailun_sku_quantity_shipped) >= 0
-    ON DUPLICATE KEY 	UPDATE  quantity_unshipped = VALUES(quantity_unshipped),gmt_unshipped_modified =  VALUES(gmt_unshipped_modified)
+    ON DUPLICATE KEY 	UPDATE  quantity_unshipped = VALUES(quantity_unshipped),gmt_unshipped_modified =  VALUES(gmt_unshipped_modified),bailun_order_ids = VALUES(bailun_order_ids)
   </insert>
 </mapper>
\ No newline at end of file

data-mid/mid-calculate-transit/src/main/java/com/bailuntec/job/CalculateOutStockJob.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.TransactionIsolationLevel;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,6 +20,7 @@ public class CalculateOutStockJob implements SimpleJob {
     @Override
     public void execute(ShardingContext shardingContext) {
         SqlSession sqlSession = SessionUtil.getFactory().openSession(TransactionIsolationLevel.READ_UNCOMMITTED);
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime localDateTime = LocalDateTime.now();
         try {
             DcMidTransitMapper mapper = sqlSession.getMapper(DcMidTransitMapper.class);
@@ -39,7 +41,7 @@ public class CalculateOutStockJob implements SimpleJob {
         try {
             DcMidTransitMapper mapper = sqlSessionUpdate.getMapper(DcMidTransitMapper.class);
          //   LocalDateTime localDateTime = mapper.selectMaxOutStockModified();
-            mapper.updateOldOutStockToZero(localDateTime);
+            mapper.updateOldOutStockToZero(df.format(localDateTime));
             sqlSessionUpdate.commit();
         } catch (Exception e) {
             e.printStackTrace();

data-mid/mid-calculate-transit/src/main/java/com/bailuntec/job/CalculatePurchaseTransit.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.TransactionIsolationLevel;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Slf4j
@@ -19,6 +20,7 @@ public class CalculatePurchaseTransit implements SimpleJob {
     public void execute(ShardingContext shardingContext) {
 
         SqlSession sqlSession = SessionUtil.getFactory().openSession(TransactionIsolationLevel.READ_UNCOMMITTED);
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime localDateTime = LocalDateTime.now();
         try {
             DcMidTransitMapper mapper = sqlSession.getMapper(DcMidTransitMapper.class);
@@ -39,7 +41,7 @@ public class CalculatePurchaseTransit implements SimpleJob {
         try {
             DcMidTransitMapper mapper = sqlSessionUpdate.getMapper(DcMidTransitMapper.class);
           //  LocalDateTime localDateTime = mapper.selectMaxPurchaseModified();
-            mapper.updateOldPurchaseToZero(localDateTime);
+            mapper.updateOldPurchaseToZero(df.format(localDateTime));
             sqlSessionUpdate.commit();
         } catch (Exception e) {
             e.printStackTrace();

data-mid/mid-calculate-transit/src/main/java/com/bailuntec/job/CalculateTransferTransit.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.TransactionIsolationLevel;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Slf4j
@@ -18,6 +19,7 @@ public class CalculateTransferTransit implements SimpleJob {
     @Override
     public void execute(ShardingContext shardingContext) {
         SqlSession sqlSession = SessionUtil.getFactory().openSession(TransactionIsolationLevel.READ_UNCOMMITTED);
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime localDateTime = LocalDateTime.now();
         try {
             DcMidTransitMapper mapper = sqlSession.getMapper(DcMidTransitMapper.class);
@@ -38,7 +40,7 @@ public class CalculateTransferTransit implements SimpleJob {
         try {
             DcMidTransitMapper mapper = sqlSessionUpdate.getMapper(DcMidTransitMapper.class);
          //   LocalDateTime localDateTime = mapper.selectMaxTransferModified();
-            mapper.updateOldTransferToZero(localDateTime);
+            mapper.updateOldTransferToZero(df.format(localDateTime));
             sqlSessionUpdate.commit();
         } catch (Exception e) {
             e.printStackTrace();