物流公司名称

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.admin.domain.TicketBox;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.common.service.IDeliveryCompanyService;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.service.ISysUserService;
@@ -80,6 +81,9 @@ public class ChannelOrderController extends BaseApiController {
   @Autowired
   private IChannelService channelService;
 
+  @Autowired
+  private IDeliveryCompanyService deliveryCompanyService;
+
   @Autowired
   private ISysUserService sysUserService;
 
@@ -123,6 +127,9 @@ public class ChannelOrderController extends BaseApiController {
     ChannelOrderVO channelOrderVO = mapperFacade.map(channelOrder, ChannelOrderVO.class);
     channelOrderVO.setItems(channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
         .eq(ChannelOrderItem::getOrderId, channelOrderVO.getOrderId())));
+    if (null != channelOrder.getDeliveryId() && 0 != channelOrder.getDeliveryId()) {
+      channelOrderVO.setChannelName(deliveryCompanyService.getById(channelOrder.getDeliveryId()).getCompanyName());
+    }
     return AjaxResult.success(channelOrderVO);
   }
 

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOrderVO.java

@@ -11,8 +11,10 @@ import lombok.Data;
  */
 @Data
 public class ChannelOrderVO extends ChannelOrder {
-	
+
   private List<ChannelOrderItem> items;
-  
+
   private String channelName;  // 经销商名称
+
+  private String companyName; // 物流公司名称
 }