1. 多小票乱序

2. 多商品乱序

src/main/java/com/pavis/ai/kwp/ioc/service/impl/CallbackAdapterImpl.java

@@ -3,7 +3,6 @@ package com.pavis.ai.kwp.ioc.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.pavis.ai.kwp.ioc.common.config.Constants;
 import com.pavis.ai.kwp.ioc.dto.meta.*;
 import com.pavis.ai.kwp.ioc.mapper.*;
@@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -46,9 +44,9 @@ public class CallbackAdapterImpl implements CallbackAdapter {
         det.setTripType(upMain.getTripType());
         // 不是无小票类型时才会有小票数据
         if (!StringUtils.equals(Constants.TRIP_TYPE_NT, upMain.getTripType())) {
-            Map<String, Object> map = Maps.newHashMap();
-            map.put("upload_id", uploadId);
-            List<UpTrip> upTrips = upTripMapper.selectByMap(map);
+            QueryWrapper<UpTrip> wrapper = new QueryWrapper<>();
+            wrapper.lambda().eq(UpTrip::getUploadId, uploadId).orderByAsc(UpTrip::getId);
+            List<UpTrip> upTrips = upTripMapper.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(upTrips)) {
                 List<String> tripImgs = upTrips.stream().map(UpTrip::getTripImg).collect(Collectors.toList());
                 det.setTripImgs(tripImgs);
@@ -89,9 +87,9 @@ public class CallbackAdapterImpl implements CallbackAdapter {
     @Override
     public List<GoodsRet> gRet(String uploadId) {
         List<GoodsRet> rets = Lists.newArrayList();
-        Map<String, Object> map = Maps.newHashMap();
-        map.put("upload_id", uploadId);
-        List<UpGoods> upGoods = upGoodsMapper.selectByMap(map);
+        QueryWrapper<UpGoods> ugWrapper = new QueryWrapper<>();
+        ugWrapper.lambda().eq(UpGoods::getUploadId, uploadId).orderByAsc(UpGoods::getId);
+        List<UpGoods> upGoods = upGoodsMapper.selectList(ugWrapper);
         if (CollectionUtils.isNotEmpty(upGoods)) {
             for (UpGoods upGood : upGoods) {
                 GoodsRet ret = new GoodsRet();