fix

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport2.java

@@ -47,7 +47,7 @@ public class Transport2 implements Serializable {
     private BigDecimal freightFee;
 
      @ApiModelProperty(value = "渠道ID", required = true)
-    private Integer channelId;
+    private Long channelId;
 
     /**
      * 创建时间

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

@@ -30,5 +30,5 @@ public interface Transport2Mapper extends BaseMapper<Transport2> {
 
     ShopTransport findShopTransports(@Param("shopId") Long shopId);
 
-    Transport2 findByPlatform(Integer platform);
+    Transport2 findByPlatform(Long platform);
 }

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

@@ -33,7 +33,7 @@ public interface Transport2Service extends IService<Transport2> {
 
     Transport2 findByDistance(Long shopId, Integer platform);
 
-    Transport2 findByPlatform(Integer platform);
+    Transport2 findByPlatform(Long platform);
 
     Transport2 findByDistance(Long shopId, Double distance, Double weight);
 
@@ -43,4 +43,5 @@ public interface Transport2Service extends IService<Transport2> {
     default void removeTransportAndAllItemsCache(Long transportId) {
     }
 
+    Transport2 queryTransport2ByChannelId(Long channelId);
 }

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

@@ -80,7 +80,7 @@ public class Transport2ServiceImpl extends ServiceImpl<Transport2Mapper, Transpo
     }
 
     @Override
-    public Transport2 findByPlatform(Integer platform) {
+    public Transport2 findByPlatform(Long platform) {
         return transportMapper.findByPlatform(platform);
     }
 
@@ -94,4 +94,9 @@ public class Transport2ServiceImpl extends ServiceImpl<Transport2Mapper, Transpo
         ShopTransport shopTransports = transportMapper.findShopTransports(shopId);
         return shopTransports;
     }
+
+    @Override
+    public Transport2 queryTransport2ByChannelId(Long channelId) {
+        return transportMapper.findByPlatform(channelId);
+    }
 }

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

@@ -233,7 +233,7 @@ public class TransportManagerServiceImpl implements TransportManagerService {
         System.out.println("门店纬度"+shopDetailByShopId.getShopLng());
         double v = calculateDistance(latitude, longitude, Double.valueOf(shopDetailByShopId.getShopLat()), Double.valueOf(shopDetailByShopId.getShopLng()));
         //Transport2 byDistance = transport2Service.findByDistance(shopId, platform);
-        Transport2 byDistance = transport2Service.findByPlatform(platform);
+        Transport2 byDistance = transport2Service.findByPlatform(Long.valueOf(platform));
         System.out.println("byDistance"+byDistance);
 
         TzTransportDto tzTransportDto = new TzTransportDto();

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

@@ -0,0 +1,40 @@
+package com.yami.shop.platform.controller;
+
+import com.yami.shop.bean.model.Transport2;
+import com.yami.shop.common.util.R;
+import com.yami.shop.delivery.comment.service.Transport2Service;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/platform/transport2")
+public class Transport2Controller {
+
+    @Autowired
+    private Transport2Service transportService;
+
+    @GetMapping("/queryTransport2ByChannelId/{channelId}")
+    @ApiOperation(value = "企业ID查询运费模板")
+    public R<Transport2> queryTransport2ByChannelId(@PathVariable("channelId") Long channelId) {
+        return R.SUCCESS(transportService.queryTransport2ByChannelId(channelId));
+    }
+
+    @PostMapping("/addOrEdit")
+    @ApiOperation(value = "新增或更新运费模板")
+    public R<Void> addOrEdit(Transport2 transport) {
+        if (transport.getChannelId() != null) {
+            Transport2 transport2 = transportService.queryTransport2ByChannelId(transport.getChannelId());
+            if (transport2 != null) {
+                transport.setTransportId(transport2.getTransportId());
+                transportService.updateById(transport);
+            } else {
+                transportService.save(transport);
+            }
+        }else {
+            transportService.save(transport);
+        }
+        return R.SUCCESS();
+    }
+
+}