Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!447

mp-admin/src/main/java/com/qs/mp/web/controller/common/LogisticsController.java

@@ -3,6 +3,7 @@ package com.qs.mp.web.controller.common;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.json.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.google.gson.Gson;
 import com.kuaidi100.sdk.api.AutoNum;
 import com.kuaidi100.sdk.api.QueryTrack;
@@ -102,6 +103,13 @@ public class LogisticsController extends BaseApiController {
                 return AjaxResult.error(jsonObject.getStr("message"));
             }
             List<LogisticsQueryVO> data = JSONUtil.toList(jsonObject.getStr("data"), LogisticsQueryVO.class);
+            if (CollectionUtils.isNotEmpty(data) && data.size() > 1) {
+                for (int i = data.size() - 1; i > 0; i--) {
+                    if (data.get(i).getStatus().equals(data.get(i-1).getStatus())) {
+                        data.get(i).setStatus("");
+                    }
+                }
+            }
             return AjaxResult.success(data);
 
         } catch (Exception e) {