打包遗留问题

yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.app.dto.ShopCartItemDto;
 import com.yami.shop.bean.app.dto.ShopCartOrderDto;
 import com.yami.shop.bean.app.param.OrderParam;
+import com.yami.shop.bean.dto.TzTransportDto;
 import com.yami.shop.bean.enums.DvyType;
 import com.yami.shop.bean.event.ConfirmOrderEvent;
 import com.yami.shop.bean.model.*;
@@ -110,7 +111,7 @@ public class ConfirmOrderListener {
 //        if (userAddr != null && !Objects.equals(orderParam.getDvyType(), DvyType.FETCH.value())) {
         if (userAddr != null) {
             // 根据配送范围计算配送费，没超出就
-            Transport2 transport2 = transportManagerService.calculateTransfeeSecondTransport2(shopCartItems.get(0).getShopId(), userAddr, orderParam.getPlatform());
+            TzTransportDto transport2 = transportManagerService.calculateTransfeeSecondTransport2(shopCartItems.get(0).getShopId(), userAddr, orderParam.getPlatform());
             if (ObjectUtils.isEmpty(transport2)) throw new GlobalException("该渠道下的门店尚未配置可用运费模板");
             switch (orderParam.getPlatform()) {
                 case 1://企业用户，计算分单规则

yami-shop-api/src/main/resources/application.yml

@@ -2,7 +2,8 @@
 spring:
   # 环境 dev|prod|docker
   profiles:
-    active: prod
+    active: dev
+#    active: prod
   #文件上传设置
   servlet:
     multipart:

yami-shop-bean/src/main/java/com/yami/shop/bean/dto/TzTransportDto.java

@@ -0,0 +1,68 @@
+package com.yami.shop.bean.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * TODO
+ *
+ * @author mr wang
+ * @version 1.0.0
+ * @since 2025-09-29
+ */
+@Data
+public class TzTransportDto {
+    /**
+     * 运费模板id
+     */
+    @ApiModelProperty(value = "运费模板id", required = true)
+    private Long transportId;
+
+    /**
+     * 运费模板名称
+     */
+
+    @ApiModelProperty(value = "运费模板名称", required = true)
+    private String transName;
+
+
+    @ApiModelProperty(value = "重量限制", required = true)
+    private Double weight;
+
+    @ApiModelProperty(value = "费用（元/20kg）", required = true)
+    private BigDecimal freightFee;
+
+    @ApiModelProperty(value = "渠道ID", required = true)
+    private Integer channelId;
+
+    /**
+     * 创建时间
+     */
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+    /**
+     * 店铺id
+     */
+
+    @ApiModelProperty(value = "店铺id", required = true)
+    private Long shopId;
+
+    @ApiModelProperty(value = "配送距离", required = true)
+    private Double distance;
+
+    @ApiModelProperty(value = "订单需要满多少", required = true)
+    private Double amount;
+
+    @ApiModelProperty(value = "配送费", required = true)
+    private Double piece;
+
+    private Double targetDistance;
+
+}

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

@@ -72,8 +72,5 @@ public class Transport2 implements Serializable {
 
     @ApiModelProperty(value = "配送费", required = true)
     private Double piece;
-    //用户范围
-    private Double targetDistance;
-
 
 }

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

@@ -12,6 +12,7 @@ package com.yami.shop.delivery.comment.service;
 
 import com.yami.shop.bean.app.dto.ProductItemDto;
 import com.yami.shop.bean.app.dto.ShopCartItemDto;
+import com.yami.shop.bean.dto.TzTransportDto;
 import com.yami.shop.bean.model.UserAddr;
 import com.yami.shop.bean.model.Transport2;
 
@@ -28,7 +29,7 @@ public interface TransportManagerService {
 
 
     Double calculateTransfeeSecond2(Long shopId, UserAddr userAddr);
-    Transport2 calculateTransfeeSecondTransport2(Long shopId, UserAddr userAddr,Integer platform);
+    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/TransportManagerServiceImpl.java

@@ -14,6 +14,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.yami.shop.bean.app.dto.ProductItemDto;
 import com.yami.shop.bean.app.dto.ShopCartItemDto;
+import com.yami.shop.bean.dto.TzTransportDto;
 import com.yami.shop.bean.enums.TransportChargeType;
 import com.yami.shop.bean.model.*;
 import com.yami.shop.common.exception.GlobalException;
@@ -30,6 +31,7 @@ import com.yami.shop.service.ProductService;
 import com.yami.shop.service.ShopDetailService;
 import com.yami.shop.service.SkuService;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -215,7 +217,7 @@ public class TransportManagerServiceImpl implements TransportManagerService {
     }
 
     @Override
-    public Transport2 calculateTransfeeSecondTransport2(Long shopId, UserAddr userAddr, Integer platform) {
+    public TzTransportDto calculateTransfeeSecondTransport2(Long shopId, UserAddr userAddr, Integer platform) {
         Double longitude = userAddr.getLongitude();
         Double latitude = userAddr.getLatitude();
         if (longitude.equals(0.0)) {
@@ -225,8 +227,10 @@ public class TransportManagerServiceImpl implements TransportManagerService {
         ShopDetail shopDetailByShopId = shopDetailService.getShopDetailByShopId(shopId);
         double v = calculateDistance(latitude, longitude, Double.valueOf(shopDetailByShopId.getShopLat()), Double.valueOf(shopDetailByShopId.getShopLng()));
         Transport2 byDistance = transport2Service.findByDistance(shopId, platform);
-        byDistance.setTargetDistance(v);
-        return byDistance;
+        TzTransportDto tzTransportDto = new TzTransportDto();
+        BeanUtils.copyProperties(byDistance, tzTransportDto);
+        tzTransportDto.setTargetDistance(v);
+        return tzTransportDto;
     }
 
     @Override

yami-shop-platform/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   # 环境 dev|prod|docker quartz定时任务
   profiles:
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
   #文件上传设置
   servlet:
     multipart: