调整接口

platform-api/src/main/java/com/platform/api/ApiOrderController.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.Duration;
@@ -219,7 +220,11 @@ public class ApiOrderController extends ApiBaseAction {
         }
 
         for(OrderShippingVo orderShippingVo : shippingVoList){
-            orderShippingVo.setBrandName(apiBrandService.queryObject(orderShippingVo.getBrandId()).getName());
+            BrandVo brandVo = apiBrandService.queryObject(orderShippingVo.getBrandId());
+            orderShippingVo.setBrandName(orderShippingVo.getBrandName());
+            if(!ObjectUtils.isEmpty(brandVo)){
+                orderShippingVo.setBrandName(brandVo.getName());
+            }
         }
 
         //订单可操作的选择,删除，支付，收货，评论，退换货