diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/CMKJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/CMKJob.java index 2df72bb49..559003d4f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/CMKJob.java +++ b/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 DEFAULT_TRANSPORTERS = Arrays.asList("CMK-JJ-PH 法 美 德", "CMK-DB-PH6000", "CMK-DB-PH18000", "CMK-DB-PH10000"); @@ -121,4 +120,4 @@ public class CMKJob implements Job { } } -} \ No newline at end of file +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ParcelMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ParcelMapper.java index ae6c8b825..c77db7b5e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ParcelMapper.java +++ b/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 { void insertOrUpdateEQParcels(List parcels); void insertOrIgnoreYDParcels(List parcels); - void insertOrIgnoreCMKParcels(List parcels); + void insertOrIgnoreCMKParcels(List parcels); /** * fetch all parcels from platform order's tracking number, to archive * @param trackingNumbers diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml index 24a6c96c9..0f8036f6b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml @@ -86,6 +86,25 @@ ) + + INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country, + third_bill_code, order_no, product_code) + VALUES + + ( + #{parcel.id}, + 'cmk api', + NOW(), + 'cmk api', + NOW(), + #{parcel.thirdBillCode}, + #{parcel.country}, + #{parcel.thirdBillCode}, + #{parcel.detail.orderNo}, + #{parcel.detail.productCode} + ) + + + INSERT INTO parcel_delete(id, create_by, create_time, - update_by, update_time, bill_code, - country, third_bill_code, - order_no, product_code) + update_by, update_time, bill_code, + country, third_bill_code, + order_no, product_code) VALUES ( diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ParcelServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ParcelServiceImpl.java index 1b0cb5341..e65b25397 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ParcelServiceImpl.java +++ b/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 impleme } log.info("Finished inserting {} parcels and their traces into DB.", parcelTraces.size()); } + @Override @Transactional public void saveCMKParcelAndTraces(List parcelTraces) {