fix

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/dao/Transport2Mapper.java

@@ -11,7 +11,9 @@
 package com.yami.shop.delivery.comment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.Transport2;
+import com.yami.shop.common.util.PageAdapter;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +33,7 @@ public interface Transport2Mapper extends BaseMapper<Transport2> {
     ShopTransport findShopTransports(@Param("shopId") Long shopId);
 
     Transport2 findByPlatform(Long platform);
+
+    IPage<Transport2> transport2List(PageAdapter pageAdapter);
+
 }

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/Transport2Service.java

@@ -11,8 +11,10 @@
 package com.yami.shop.delivery.comment.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yami.shop.bean.model.Transport2;
+import com.yami.shop.common.util.PageParam;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import org.springframework.cache.annotation.CacheEvict;
 
@@ -44,4 +46,7 @@ public interface Transport2Service extends IService<Transport2> {
     }
 
     Transport2 queryTransport2ByChannelId(Long channelId);
+
+    IPage<Transport2> transport2List(PageParam<Transport2> page);
+
 }

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/TransportManagerService.java

@@ -29,6 +29,7 @@ public interface TransportManagerService {
 
 
     Double calculateTransfeeSecond2(Long shopId, UserAddr userAddr);
+
     TzTransportDto calculateTransfeeSecondTransport2(Long shopId, UserAddr userAddr, Integer platform);
 
     Double calculateTransfeeSecond2(Long shopId, UserAddr userAddr, Double weight);

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/impl/Transport2ServiceImpl.java

@@ -10,9 +10,12 @@
 
 package com.yami.shop.delivery.comment.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yami.shop.delivery.comment.dao.Transport2Mapper;
 import com.yami.shop.bean.model.Transport2;
+import com.yami.shop.common.util.PageAdapter;
+import com.yami.shop.common.util.PageParam;
+import com.yami.shop.delivery.comment.dao.Transport2Mapper;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import lombok.AllArgsConstructor;
@@ -99,4 +102,9 @@ public class Transport2ServiceImpl extends ServiceImpl<Transport2Mapper, Transpo
     public Transport2 queryTransport2ByChannelId(Long channelId) {
         return transportMapper.findByPlatform(channelId);
     }
+
+    @Override
+    public IPage<Transport2> transport2List(PageParam<Transport2> page) {
+        return  transportMapper.transport2List(new PageAdapter(page));
+    }
 }

yami-shop-delivery/yami-shop-delivery-comment/src/main/resources/mapper/Transport2Mapper.xml

@@ -88,4 +88,11 @@
         ORDER BY p.distance LIMIT 1
     </select>
 
+    <select id="transport2List" resultMap="BaseResultMap">
+        SELECT *
+        FROM tz_transport2
+        WHERE !ISNULL(channel_id)
+        LIMIT #{begin} , #{size}
+    </select>
+
 </mapper>

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/Transport2Controller.java

@@ -1,6 +1,8 @@
 package com.yami.shop.platform.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.Transport2;
+import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.R;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +16,14 @@ public class Transport2Controller {
     @Autowired
     private Transport2Service transportService;
 
+    @GetMapping("/transport2List")
+    @ApiOperation("后管端-企业运费列表")
+    public R<IPage<Transport2>> transport2List(PageParam<Transport2> page) {
+        IPage<Transport2> orderIPage = transportService.transport2List(page);
+        return R.SUCCESS(orderIPage);
+    }
+
+
     @GetMapping("/queryTransport2ByChannelId/{channelId}")
     @ApiOperation(value = "企业ID查询运费模板")
     public R<Transport2> queryTransport2ByChannelId(@PathVariable("channelId") Long channelId) {