github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into upgrade/master3.5.3

pull/6221/head
Gauthier LO 2023-07-27 11:12:59 +02:00 committed by GitHub
parent 1df5f6a7ae f999fc3a25
commit 94debfb669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.business.mapper.ParcelMapper"> <mapper namespace="org.jeecg.modules.business.mapper.ParcelMapper">
<insert id="insertOrIgnoreJTParcels" parameterType="list"> <insert id="insertOrIgnoreJTParcels" parameterType="list">
INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country, INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country,
third_bill_code, order_no) third_bill_code, order_no)
VALUES VALUES
<foreach collection="parcels" separator="," open="" close="" item="parcel" index="index"> <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
( (
@ -94,12 +94,10 @@
#{number} #{number}
</foreach>; </foreach>;
</select> </select>
<insert id="insertParcelsArchive" parameterType="list"> <insert id="insertParcelsArchive" parameterType="list">
INSERT INTO parcel_delete(id, create_by, create_time, 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)
VALUES VALUES
<foreach collection="parcels" separator="," open="" close="" item="parcel" index="index"> <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
( (