运输服务增加接口保存物流托运接口

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java

@@ -2,8 +2,12 @@ package com.sckw.transport.controller;
 
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.easyexcel.RequestHolder;
+import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.ConsignOrderQuery;
+import com.sckw.transport.model.vo.ConsignOrderVo;
 import com.sckw.transport.service.ConsignOrderService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author lfdc
  * @description 托运订单controller
@@ -27,6 +33,7 @@ public class ConsignOrderController {
 
     /**
      * 托运订单首页条件查询
+     *
      * @param query 查询参数
      * @return
      */
@@ -35,9 +42,42 @@ public class ConsignOrderController {
         try {
             return consignOrderService.list(query);
         } catch (Exception e) {
-            log.error("承运订单查询失败:{}", e.getMessage(), e);
+            log.error("托运订单查询失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
 
+    /**
+     * 托运订单top统计
+     *
+     * @param query
+     * @return
+     */
+    @RequestMapping(value = "/statistics", method = RequestMethod.GET)
+    public HttpResult statistics(ConsignOrderQuery query) {
+        try {
+            return consignOrderService.statistics(query);
+        } catch (Exception e) {
+            log.error("托运订单top统计失败:{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
+    /**
+     * 托运订单导出
+     *
+     * @param query 查询参数
+     * @return
+     */
+    @RequestMapping(value = "/export", method = RequestMethod.GET)
+    public HttpResult export(ConsignOrderQuery query) {
+        HttpServletResponse response = RequestHolder.getResponse();
+        List<ConsignOrderVo> list = consignOrderService.export(query);
+        if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
+            ExcelUtil.download(response, ConsignOrderVo.class, list);
+            return null;
+        }
+        return HttpResult.error("没有可导出的数据");
+    }
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderAddressMapper.java

@@ -6,15 +6,15 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface KwtLogisticsOrderAddressMapper extends BaseMapper<KwtLogisticsOrderAddress> {
-    int deleteByPrimaryKey(Long id);
-
-    int insert(KwtLogisticsOrderAddress record);
-
-    int insertSelective(KwtLogisticsOrderAddress record);
-
-    KwtLogisticsOrderAddress selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(KwtLogisticsOrderAddress record);
-
-    int updateByPrimaryKey(KwtLogisticsOrderAddress record);
+//    int deleteByPrimaryKey(Long id);
+//
+//    int insert(KwtLogisticsOrderAddress record);
+//
+//    int insertSelective(KwtLogisticsOrderAddress record);
+//
+//    KwtLogisticsOrderAddress selectByPrimaryKey(Long id);
+//
+//    int updateByPrimaryKeySelective(KwtLogisticsOrderAddress record);
+//
+//    int updateByPrimaryKey(KwtLogisticsOrderAddress record);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderGoodsMapper.java

@@ -6,15 +6,15 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface KwtLogisticsOrderGoodsMapper extends BaseMapper<KwtLogisticsOrderGoods> {
-    int deleteByPrimaryKey(Long id);
-
-    int insert(KwtLogisticsOrderGoods record);
-
-    int insertSelective(KwtLogisticsOrderGoods record);
-
-    KwtLogisticsOrderGoods selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(KwtLogisticsOrderGoods record);
-
-    int updateByPrimaryKey(KwtLogisticsOrderGoods record);
+//    int deleteByPrimaryKey(Long id);
+//
+//    int insert(KwtLogisticsOrderGoods record);
+//
+//    int insertSelective(KwtLogisticsOrderGoods record);
+//
+//    KwtLogisticsOrderGoods selectByPrimaryKey(Long id);
+//
+//    int updateByPrimaryKeySelective(KwtLogisticsOrderGoods record);
+//
+//    int updateByPrimaryKey(KwtLogisticsOrderGoods record);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwoTradeOrderAddressRepository.java

@@ -1,12 +0,0 @@
-package com.sckw.transport.dao.repository;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.model.KwoTradeOrderAddress;
-
-/**
- * @author lfdc
- * @description 贸易订单repository
- * @date 2023-07-04 08:07:39
- */
-public interface KwoTradeOrderAddressRepository extends IService<KwoTradeOrderAddress> {
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwoTradeOrderRepository.java

@@ -1,14 +0,0 @@
-package com.sckw.transport.dao.repository;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.model.KwoTradeOrder;
-
-
-/**
- * @author lfdc
- * @description 订单实体repository
- * @date 2023-07-06 08:07:39
- */
-//@Mapper
-public interface KwoTradeOrderRepository extends IService<KwoTradeOrder> {
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderAddressRepository.java

@@ -1,13 +0,0 @@
-package com.sckw.transport.dao.repository;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.model.KwtLogisticsOrderAddress;
-
-/**
- * @author lfdc
- * @description 地址管理repository
- * @date 2023-07-04 08:07:39
- */
-public interface KwtLogisticsOrderAddressRepository extends IService<KwtLogisticsOrderAddress> {
-
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderContractRepository.java

@@ -1,12 +0,0 @@
-package com.sckw.transport.dao.repository;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.model.KwtLogisticsOrderContract;
-
-/**
- * @author lfdc
- * @description 合同repository
- * @date 2023-07-06 08:07:39
- */
-public interface KwtLogisticsOrderContractRepository extends IService<KwtLogisticsOrderContract> {
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderGoodsRepository.java

@@ -1,13 +0,0 @@
-package com.sckw.transport.dao.repository;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.model.KwtLogisticsOrderGoods;
-
-/**
- * @author lfdc
- * @description 物流商品信息管理repository
- * @date 2023-07-04 08:07:39
- */
-public interface KwtLogisticsOrderGoodsRepository extends IService<KwtLogisticsOrderGoods> {
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderRepository.java

@@ -1,12 +0,0 @@
-package com.sckw.transport.dao.repository;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.model.KwtLogisticsOrder;
-
-/**
- * @author lfdc
- * @description 物流订单repository
- * @date 2023-07-04 08:07:39
- */
-public interface KwtLogisticsOrderRepository extends IService<KwtLogisticsOrder> {
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwoProjectOrder.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwo_project_order")
+@TableName("sckw-order.kwo_project_order")
 public class KwoProjectOrder extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwoTradeOrderAddress.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwo_trade_order_address")
+@TableName("sckw-order.kwo_trade_order_address")
 public class KwoTradeOrderAddress extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwoTradeOrderContract.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwo_trade_order_contract")
+@TableName("sckw-order.kwo_trade_order_contract")
 public class KwoTradeOrderContract extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwoTradeOrderGoods.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwo_trade_order_goods")
+@TableName("sckw-order.kwo_trade_order_goods")
 public class KwoTradeOrderGoods extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwoTradeOrderTrack.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwo_trade_order_track")
+@TableName("sckw-order.kwo_trade_order_track")
 public class KwoTradeOrderTrack extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwoTradeOrderUnit.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwo_trade_order_unit")
+@TableName("sckw-order.kwo_trade_order_unit")
 public class KwoTradeOrderUnit extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwpTransportDemand.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwp_transport_demand")
+@TableName("sckw-order.kwp_transport_demand")
 public class KwpTransportDemand extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwpWantBuy.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("sckw.kwp_want_buy")
+@TableName("sckw-order.kwp_want_buy")
 public class KwpWantBuy extends BaseModel {
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderContract.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @date 2023-07-06 16:06:12
  */
 @Data
-@TableName("kwt_logistics_order_contract")
+@TableName("sckw_transport.kwt_logistics_order_contract")
 public class KwtLogisticsOrderContract implements Serializable {
     /**
      * 主键

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderGoods.java

@@ -1,9 +1,11 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -12,7 +14,7 @@ import java.io.Serializable;
  * @date 2023-06-26 16:06:12
  */
 @Data
-@TableName("sckw_transport.kwt_logistics_order_address")
+@TableName("sckw_transport.kwt_logistics_order_goods")
 public class KwtLogisticsOrderGoods implements Serializable {
     /**
      * 主键
@@ -22,12 +24,12 @@ public class KwtLogisticsOrderGoods implements Serializable {
     /**
      * 物流订单id
      */
-    private Long orderId;
+    private Long lOrderId;
 
     /**
      * 物流订单编号
      */
-    private String orderNo;
+    private String lOrderNo;
 
     /**
      * 商品id
@@ -39,5 +41,32 @@ public class KwtLogisticsOrderGoods implements Serializable {
      */
     private Long skuId;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    private Integer status = 0;
+
+    private Long createBy;
+
+    private Date createTime;
+
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic("0")
+    private Integer delFlag = 0;
+
     private static final long serialVersionUID = 1L;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderSubcontract.java

@@ -1,6 +1,5 @@
 package com.sckw.transport.model;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,7 +12,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
-@TableName("sckw_transport.kwt_logistics_order_address")
+//@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtLogisticsOrderSubcontract implements Serializable {
     /**
      * 主键

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderTrack.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
-@TableName("sckw_transport.kwt_logistics_order_address")
+@TableName("sckw_transport.kwt_logistics_order_track")
 public class KwtLogisticsOrderTrack implements Serializable {
     /**
      * 主键

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsConsignmentParam.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.param;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -72,14 +73,17 @@ public class LogisticsConsignmentParam {
     /**
      * 是否全量
      */
+    @NotNull(message = "是否全量不能为空")
     private Boolean isFullDose;
     /**
      * 订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
     /**
      * 订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
     /**
      * 运价

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -7,8 +7,6 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.dao.KwtLogisticsOrderAddressMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderUnitMapper;
-import com.sckw.transport.dao.repository.KwtLogisticsOrderAddressRepository;
-import com.sckw.transport.dao.repository.KwtLogisticsOrderRepository;
 import com.sckw.transport.model.KwtLogisticsOrder;
 import com.sckw.transport.model.KwtLogisticsOrderUnit;
 import com.sckw.transport.model.param.ConsignOrderQuery;
@@ -17,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,13 +28,9 @@ import java.util.stream.Collectors;
 @Service
 public class ConsignOrderService {
 
-    @Autowired
-    public KwtLogisticsOrderRepository kwtLogisticsOrderRepository;
 
     @Autowired
     public KwtLogisticsOrderMapper kwtLogisticsOrderMapper;
-    @Autowired
-    public KwtLogisticsOrderAddressRepository kwtLogisticsOrderAddressRepository;
 
     @Autowired
     public KwtLogisticsOrderAddressMapper kwtLogisticsOrderAddressMapper;
@@ -49,9 +44,17 @@ public class ConsignOrderService {
 //        kwtLogisticsOrderRepository.page(new Page<>(query.getPage(), query.getPageSize()),
 //                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
 //                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
-        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderRepository.list(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
+        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
         List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
         List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
         return null;
     }
+
+    public HttpResult statistics(ConsignOrderQuery query) {
+        return null;
+    }
+
+    public List<ConsignOrderVo> export(ConsignOrderQuery query) {
+        return new ArrayList<ConsignOrderVo>();
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -8,8 +8,7 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
-import com.sckw.transport.dao.KwoTradeOrderMapper;
-import com.sckw.transport.dao.repository.*;
+import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import lombok.extern.slf4j.Slf4j;
@@ -28,27 +27,24 @@ import java.util.Date;
 @Slf4j
 @Service
 public class LogisticsConsignmentService {
-
     @Autowired
-    public KwtLogisticsOrderRepository kwtLogisticsOrderRepository;
+    public KwoTradeOrderMapper kwoTradeOrderMapper;
 
     @Autowired
-    public KwtLogisticsOrderAddressRepository kwtLogisticsOrderAddressRepository;
+    public KwtLogisticsOrderGoodsMapper kwtLogisticsOrderGoodsMapper;
 
     @Autowired
-    public KwoTradeOrderRepository kwoTradeOrderRepository;
+    public KwtLogisticsOrderContractMapper kwtLogisticsOrderContractMapper;
 
     @Autowired
-    public KwoTradeOrderMapper kwoTradeOrderMapper;
+    public KwtLogisticsOrderMapper kwtLogisticsOrderMapper;
 
     @Autowired
-    public KwtLogisticsOrderContractRepository kwtLogisticsOrderContractRepository;
+    public KwoTradeOrderAddressMapper kwoTradeOrderAddressMapper;
 
     @Autowired
-    public KwoTradeOrderAddressRepository kwoTradeOrderAddressRepository;
+    public KwtLogisticsOrderAddressMapper kwtLogisticsOrderAddressMapper;
 
-    @Autowired
-    public KwtLogisticsOrderGoodsRepository kwtLogisticsOrderGoodsRepository;
 
     @Transactional(rollbackFor = Exception.class)
     public HttpResult purchaseLogisticsConsignment(LogisticsConsignmentParam bo) {
@@ -63,8 +59,7 @@ public class LogisticsConsignmentService {
     }
 
     void logisticsConsignmentInsert(LogisticsConsignmentParam bo) {
-//        KwoTradeOrder tradeOrder=  kwoTradeOrderDao.selectOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrder::getId, bo.getLOrderId()));
-        KwoTradeOrder tradeOrder = kwoTradeOrderRepository.getOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrder::getId, bo.getLOrderId()));
+        KwoTradeOrder tradeOrder = kwoTradeOrderMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrder::getId, bo.getLOrderId()));
         if (tradeOrder == null) {
             log.error("订单id查找失败:{}", bo.getLOrderId());
             throw new RuntimeException("单据错误,数据不存在");
@@ -90,9 +85,9 @@ public class LogisticsConsignmentService {
         KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
         kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwtLogisticsOrderGoods.setGoodsId(45646565L);
-        kwtLogisticsOrderGoods.setOrderId(Long.parseLong(bo.getLOrderId()));
-        kwtLogisticsOrderGoods.setOrderNo(bo.getLOrderNo());
-        kwtLogisticsOrderGoodsRepository.save(kwtLogisticsOrderGoods);
+        kwtLogisticsOrderGoods.setLOrderId(Long.parseLong(bo.getLOrderId()));
+        kwtLogisticsOrderGoods.setLOrderNo(bo.getLOrderNo());
+        kwtLogisticsOrderGoodsMapper.insert(kwtLogisticsOrderGoods);
     }
 
     private void insertLogisticsOrder(LogisticsConsignmentParam bo, String waybillNo, KwtLogisticsOrder order, KwoTradeOrder tradeOrder) {
@@ -120,7 +115,7 @@ public class LogisticsConsignmentService {
         order.setCreateTime(new Date());
         order.setUpdateBy(LoginUserHolder.getUserId());
         order.setUpdateTime(new Date());
-        kwtLogisticsOrderRepository.save(order);
+        kwtLogisticsOrderMapper.insert(order);
     }
 
     private void insertLogisticsOrderContract(LogisticsConsignmentParam bo) {
@@ -133,13 +128,13 @@ public class LogisticsConsignmentService {
         kwtLogisticsOrderContract.setUpdateBy(LoginUserHolder.getUserId());
         kwtLogisticsOrderContract.setCreateTime(new Date());
         kwtLogisticsOrderContract.setUpdateTime(new Date());
-        kwtLogisticsOrderContractRepository.save(kwtLogisticsOrderContract);
+        kwtLogisticsOrderContractMapper.insert(kwtLogisticsOrderContract);
     }
 
     private void insertOrderAddress(LogisticsConsignmentParam bo, String waybillNo) {
         KwtLogisticsOrderAddress loadOrderAddress = new KwtLogisticsOrderAddress();
         KwtLogisticsOrderAddress unloadOrderAddress = new KwtLogisticsOrderAddress();
-        KwoTradeOrderAddress loadkwoTradeOrderAddress = kwoTradeOrderAddressRepository.getOne(new LambdaQueryWrapper<KwoTradeOrderAddress>()
+        KwoTradeOrderAddress loadkwoTradeOrderAddress = kwoTradeOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrderAddress>()
                 .eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrderAddress::getTOrderId, bo.getLOrderId())
                 .eq(KwoTradeOrderAddress::getAddressType, NumberConstant.ONE));
         loadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -155,9 +150,9 @@ public class LogisticsConsignmentService {
         loadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
         loadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
         loadOrderAddress.setUpdateTime(new Date());
-        kwtLogisticsOrderAddressRepository.save(loadOrderAddress);
+        kwtLogisticsOrderAddressMapper.insert(loadOrderAddress);
 
-        KwoTradeOrderAddress unloadkwoTradeOrderAddress = kwoTradeOrderAddressRepository.getOne(new LambdaQueryWrapper<KwoTradeOrderAddress>()
+        KwoTradeOrderAddress unloadkwoTradeOrderAddress = kwoTradeOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrderAddress>()
                 .eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrderAddress::getTOrderId, bo.getLOrderId())
                 .eq(KwoTradeOrderAddress::getAddressType, NumberConstant.TWO));
         unloadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
@@ -174,6 +169,6 @@ public class LogisticsConsignmentService {
         unloadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
         unloadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
         unloadOrderAddress.setUpdateTime(new Date());
-        kwtLogisticsOrderAddressRepository.save(unloadOrderAddress);
+        kwtLogisticsOrderAddressMapper.insert(unloadOrderAddress);
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/OutboundHeadServiceImpl.java

@@ -1,17 +1,17 @@
-package com.sckw.transport.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sckw.transport.dao.KwoTradeOrderMapper;
-import com.sckw.transport.dao.repository.KwoTradeOrderRepository;
-import com.sckw.transport.model.KwoTradeOrder;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lfdc
- * @description
- * @date 2023-07-06 17:07:40
- */
-@Service
-public class OutboundHeadServiceImpl extends ServiceImpl<KwoTradeOrderMapper, KwoTradeOrder> implements KwoTradeOrderRepository {
-
-}
+//package com.sckw.transport.service;
+//
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import com.sckw.transport.dao.KwoTradeOrderMapper;
+//import com.sckw.transport.dao.repository.KwoTradeOrderRepository;
+//import com.sckw.transport.model.KwoTradeOrder;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * @author lfdc
+// * @description
+// * @date 2023-07-06 17:07:40
+// */
+//@Service
+//public class OutboundHeadServiceImpl extends ServiceImpl<KwoTradeOrderMapper, KwoTradeOrder> implements KwoTradeOrderRepository {
+//
+//}

sckw-modules/sckw-transport/src/main/resources/logback-spring.xml

@@ -152,7 +152,7 @@
         <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
     -->
     <!-- hibernate logger -->
-    <logger name="com.atguigu" level="debug" />
+    <logger name="com.sckw.transport" level="debug" />
     <!-- Spring framework logger -->
     <logger name="org.springframework" level="debug" additivity="false"></logger>
 
@@ -174,7 +174,7 @@
     <!-- 4. 最终的策略 -->
     <!-- 4.1 开发环境:打印控制台-->
     <springProfile name="dev">
-        <logger name="com.sdcm.pmp" level="debug"/>
+        <logger name="com.sckw.transport" level="debug"/>
     </springProfile>
 
     <root level="info">

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderGoodsDAO.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderGoodsDao">
-  <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderGoods">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="order_id" jdbcType="BIGINT" property="orderId" />
-    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
-    <result column="goods_id" jdbcType="BIGINT" property="goodsId" />
-    <result column="sku_id" jdbcType="BIGINT" property="skuId" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, order_id, order_no, goods_id, sku_id
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from kwt_logistics_order_goods
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from kwt_logistics_order_goods
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
-    insert into kwt_logistics_order_goods (id, order_id, order_no, 
-      goods_id, sku_id)
-    values (#{id,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, 
-      #{goodsId,jdbcType=BIGINT}, #{skuId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
-    insert into kwt_logistics_order_goods
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="orderId != null">
-        order_id,
-      </if>
-      <if test="orderNo != null">
-        order_no,
-      </if>
-      <if test="goodsId != null">
-        goods_id,
-      </if>
-      <if test="skuId != null">
-        sku_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="orderId != null">
-        #{orderId,jdbcType=BIGINT},
-      </if>
-      <if test="orderNo != null">
-        #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="goodsId != null">
-        #{goodsId,jdbcType=BIGINT},
-      </if>
-      <if test="skuId != null">
-        #{skuId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
-    update kwt_logistics_order_goods
-    <set>
-      <if test="orderId != null">
-        order_id = #{orderId,jdbcType=BIGINT},
-      </if>
-      <if test="orderNo != null">
-        order_no = #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="goodsId != null">
-        goods_id = #{goodsId,jdbcType=BIGINT},
-      </if>
-      <if test="skuId != null">
-        sku_id = #{skuId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
-    update kwt_logistics_order_goods
-    set order_id = #{orderId,jdbcType=BIGINT},
-      order_no = #{orderNo,jdbcType=VARCHAR},
-      goods_id = #{goodsId,jdbcType=BIGINT},
-      sku_id = #{skuId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderGoodsMapper.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderGoodsMapper">
+    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderGoods">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="l_order_id" jdbcType="BIGINT" property="lOrderId" />
+        <result column="order_no" jdbcType="VARCHAR" property="lOrderNo" />
+        <result column="goods_id" jdbcType="BIGINT" property="goodsId" />
+        <result column="sku_id" jdbcType="BIGINT" property="skuId" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+        <result column="status" jdbcType="INTEGER" property="status" />
+        <result column="create_by" jdbcType="BIGINT" property="createBy" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_by" jdbcType="BIGINT" property="updateBy" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, l_order_id, l_order_no, goods_id, sku_id, remark, `status`, create_by, create_time,
+    update_by, update_time, del_flag
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from kwt_logistics_order_goods
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from kwt_logistics_order_goods
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+<!--    <insert id="insert" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">-->
+<!--        insert into kwt_logistics_order_goods (id, l_order_id, l_order_no,-->
+<!--                                               goods_id, sku_id, remark,-->
+<!--                                               `status`, create_by, create_time,-->
+<!--                                               update_by, update_time, del_flag-->
+<!--        )-->
+<!--        values (#{id,jdbcType=BIGINT}, #{lOrderId,jdbcType=BIGINT}, #{lOrderNo,jdbcType=VARCHAR},-->
+<!--                #{goodsId,jdbcType=BIGINT}, #{skuId,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR},-->
+<!--                #{status,jdbcType=INTEGER}, #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},-->
+<!--                #{updateBy,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}-->
+<!--               )-->
+<!--    </insert>-->
+    <insert id="insertSelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
+        insert into kwt_logistics_order_goods
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="lOrderId != null">
+                l_order_id,
+            </if>
+            <if test="lOrderNo != null">
+                l_order_no,
+            </if>
+            <if test="goodsId != null">
+                goods_id,
+            </if>
+            <if test="skuId != null">
+                sku_id,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+            <if test="createBy != null">
+                create_by,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateBy != null">
+                update_by,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=BIGINT},
+            </if>
+            <if test="lOrderId != null">
+                #{lOrderId,jdbcType=BIGINT},
+            </if>
+            <if test="lOrderNo != null">
+                #{lOrderNo,jdbcType=VARCHAR},
+            </if>
+            <if test="goodsId != null">
+                #{goodsId,jdbcType=BIGINT},
+            </if>
+            <if test="skuId != null">
+                #{skuId,jdbcType=BIGINT},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=INTEGER},
+            </if>
+            <if test="createBy != null">
+                #{createBy,jdbcType=BIGINT},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                #{updateBy,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
+        update kwt_logistics_order_goods
+        <set>
+            <if test="lOrderId != null">
+                l_order_id = #{lOrderId,jdbcType=BIGINT},
+            </if>
+            <if test="lOrderNo != null">
+                l_order_no = #{lOrderNo,jdbcType=VARCHAR},
+            </if>
+            <if test="goodsId != null">
+                goods_id = #{goodsId,jdbcType=BIGINT},
+            </if>
+            <if test="skuId != null">
+                sku_id = #{skuId,jdbcType=BIGINT},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="createBy != null">
+                create_by = #{createBy,jdbcType=BIGINT},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                update_by = #{updateBy,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                del_flag = #{delFlag,jdbcType=INTEGER},
+            </if>
+        </set>
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.sckw.transport.model.KwtLogisticsOrderGoods">
+        update kwt_logistics_order_goods
+        set l_order_id = #{lOrderId,jdbcType=BIGINT},
+            l_order_no = #{lOrderNo,jdbcType=VARCHAR},
+            goods_id = #{goodsId,jdbcType=BIGINT},
+            sku_id = #{skuId,jdbcType=BIGINT},
+            remark = #{remark,jdbcType=VARCHAR},
+            `status` = #{status,jdbcType=INTEGER},
+            create_by = #{createBy,jdbcType=BIGINT},
+            create_time = #{createTime,jdbcType=TIMESTAMP},
+            update_by = #{updateBy,jdbcType=BIGINT},
+            update_time = #{updateTime,jdbcType=TIMESTAMP},
+            del_flag = #{delFlag,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+</mapper>

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderDao">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrder">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="ent_id" jdbcType="BIGINT" property="entId" />

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderSubcontractMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderSubcontractDao">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderSubcontractMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderSubcontract">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="ent_id" jdbcType="BIGINT" property="entId" />

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderTrackMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderTrackDao">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderTrackMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderTrack">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="order_id" jdbcType="BIGINT" property="orderId" />

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderDao">
+<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrder">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="ent_id" jdbcType="BIGINT" property="entId" />

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderTicketMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderTicketDao">
+<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderTicketMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrderTicket">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="order_id" jdbcType="BIGINT" property="orderId" />

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderTrackMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderTrackDao">
+<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderTrackMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrderTrack">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="order_id" jdbcType="BIGINT" property="orderId" />