Add missing CMK job

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/CMKJob.java

@@ -36,7 +36,6 @@ public class CMKJob implements Job {
     private IPlatformOrderService platformOrderService;
 
     private static final Integer DEFAULT_NUMBER_OF_DAYS = 15;
-    private static final Integer DEFAULT_NUMBER_OF_THREADS = 10;
     private static final Integer DEFAULT_MAXIMUM_NUMBER_OF_PARCELS_PER_TRANSACTION = 800;
     private static final List<String> DEFAULT_TRANSPORTERS = Arrays.asList("CMK-JJ-PH 法 美 德", "CMK-DB-PH6000", "CMK-DB-PH18000", "CMK-DB-PH10000");
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ParcelMapper.java

@@ -27,8 +27,8 @@ public interface ParcelMapper extends BaseMapper<Parcel> {
     void insertOrUpdateEQParcels(List<EQuickResponse> parcels);
 
     void insertOrIgnoreYDParcels(List<YDTraceData> parcels);
-    void insertOrIgnoreCMKParcels(List<CMKParcelTraceData> parcels);
 
+    void insertOrIgnoreCMKParcels(List<CMKParcelTraceData> parcels);
     /**
      * fetch all parcels from platform order's tracking number, to archive
      * @param trackingNumbers

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml

@@ -86,6 +86,25 @@
             )
         </foreach>
     </insert>
+    <insert id="insertOrIgnoreCMKParcels" parameterType="list">
+        INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country,
+        third_bill_code, order_no, product_code)
+        VALUES
+        <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
+            (
+            #{parcel.id},
+            'cmk api',
+            NOW(),
+            'cmk api',
+            NOW(),
+            #{parcel.thirdBillCode},
+            #{parcel.country},
+            #{parcel.thirdBillCode},
+            #{parcel.detail.orderNo},
+            #{parcel.detail.productCode}
+            )
+        </foreach>
+    </insert>
     <select id="fetchParcelsToArchive" resultType="org.jeecg.modules.business.entity.Parcel">
         SELECT *
         FROM parcel
@@ -94,11 +113,12 @@
             #{number}
         </foreach>;
     </select>
+
     <insert id="insertParcelsArchive" parameterType="list">
         INSERT INTO parcel_delete(id, create_by, create_time,
-                                    update_by, update_time, bill_code,
+        update_by, update_time, bill_code,
-                                    country, third_bill_code,
+        country, third_bill_code,
-                                    order_no, product_code)
+        order_no, product_code)
         VALUES
         <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
             (

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ParcelServiceImpl.java

@@ -225,6 +225,7 @@ public class ParcelServiceImpl extends ServiceImpl<ParcelMapper, Parcel> impleme
         }
         log.info("Finished inserting {} parcels and their traces into DB.", parcelTraces.size());
     }
+
     @Override
     @Transactional
     public void saveCMKParcelAndTraces(List<CMKParcelTraceData> parcelTraces) {