关联关系完善

src/main/java/com/sckw/freight/entity/kll/KllOrderLogisticConfig.java

@@ -0,0 +1,126 @@
+package com.sckw.freight.entity.kll;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物流商订单选项配置表
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("kll_order_logistic_config")
+public class KllOrderLogisticConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 物流商ID
+     */
+    private Integer logisticId;
+
+    /**
+     * 物流订单ID
+     */
+    private Integer orderId;
+
+    /**
+     * 预计里程（公里）
+     */
+    private BigDecimal expectedMileage;
+
+    /**
+     * 车辆类型要求
+     */
+    private String truckRequired;
+
+    /**
+     * 运输单价
+     */
+    private BigDecimal transFee;
+
+    /**
+     * 运输单价单位
+     */
+    private Integer transFeeUnit;
+
+    /**
+     * 是否开启路损约定0-否1-是
+     */
+    private Integer lostStatus;
+
+    /**
+     * 路损比例百分比
+     */
+    private BigDecimal lostPercent;
+
+    /**
+     * 路损比例计算单价
+     */
+    private BigDecimal lostPerPrice;
+
+    /**
+     * 是否开启装货电子围栏0-否1-是
+     */
+    private Integer loadFenceStatus;
+
+    /**
+     * 装货电子围栏半径
+     */
+    private Integer loadFenceRadius;
+
+    /**
+     * 是否开启上传装货重量0-否1-是
+     */
+    private Integer uploadLoadWeightStatus;
+
+    /**
+     * 是否开启上传装货磅单0-否1-是
+     */
+    private Integer uploadLoadPicStatus;
+
+    /**
+     * 是否开启卸货电子围栏0-否1-是
+     */
+    private Integer unloadFenceStatus;
+
+    /**
+     * 卸货电子围栏半径
+     */
+    private Integer unloadFenceRadius;
+
+    /**
+     * 是否开启上传卸货重量0-否1-是
+     */
+    private Integer uploadUnloadWeightStatus;
+
+    /**
+     * 是否开启上传卸货磅单0-否1-是
+     */
+    private Integer uploadUnloadPicStatus;
+
+    /**
+     * 记录时间
+     */
+    private LocalDateTime createTime;
+
+
+}

src/main/java/com/sckw/freight/entity/saas/SaasLogisticCustomer.java

@@ -0,0 +1,110 @@
+package com.sckw.freight.entity.saas;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物流贸易商客户信息
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("saas_logistic_customer")
+public class SaasLogisticCustomer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 物流公司ID
+     */
+    private Integer logisticId;
+
+    /**
+     * 客户名称
+     */
+    private String name;
+
+    /**
+     * 社会统一信用代码
+     */
+    private String uscCode;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 银行开户行
+     */
+    private String bankName;
+
+    /**
+     * 银行账户
+     */
+    private String bankAccount;
+
+    /**
+     * 联系人
+     */
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    private String contactMobile;
+
+    /**
+     * 创建人
+     */
+    private Long creatorId;
+
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+
+    /**
+     * 状态1-正常2-删除
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    /**
+     * 删除时间
+     */
+    private LocalDateTime deletedAt;
+
+    /**
+     * saas_company表id
+     */
+    private Integer companyId;
+
+
+}

src/main/java/com/sckw/freight/mapper/kll/KllOrderLogisticConfigMapper.java

@@ -0,0 +1,19 @@
+package com.sckw.freight.mapper.kll;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sckw.freight.config.DataSourceNames;
+import com.sckw.freight.entity.kll.KllOrderLogisticConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 物流商订单选项配置表 Mapper 接口
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-16
+ */
+@DS(DataSourceNames.KLL)
+public interface KllOrderLogisticConfigMapper extends BaseMapper<KllOrderLogisticConfig> {
+
+}

src/main/java/com/sckw/freight/mapper/saas/SaasLogisticCustomerMapper.java

@@ -0,0 +1,19 @@
+package com.sckw.freight.mapper.saas;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sckw.freight.config.DataSourceNames;
+import com.sckw.freight.entity.saas.SaasLogisticCustomer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 物流贸易商客户信息 Mapper 接口
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-17
+ */
+@DS(DataSourceNames.SAAS)
+public interface SaasLogisticCustomerMapper extends BaseMapper<SaasLogisticCustomer> {
+
+}

src/main/java/com/sckw/freight/model/vo/response/ResponseKllOrderTask.java

@@ -38,7 +38,7 @@ public class ResponseKllOrderTask {
      * 所属订单
      */
     @Schema(description = "所属订单")
-    private Integer orderNo;
+    private String orderNo;
 
     /**
      * 物流公司ID

src/main/java/com/sckw/freight/service/freight/impl/KwpLedgerLogisticsServiceImpl.java

@@ -183,7 +183,7 @@ public class KwpLedgerLogisticsServiceImpl extends ServiceImpl<KwpLedgerLogistic
         wrapper1.in(KwpLedgerLogisticsOrder::getLLedgerId, records.stream().map(KwpLedgerLogistics::getId).collect(Collectors.toList()));
         List<KwpLedgerLogisticsOrder> orders = iKwpLedgerLogisticsOrderService.list(wrapper1);
         if (orders == null) orders = new ArrayList<>();
-        if (orders.size() == 0) return R.failed("物流对账单[ledgerLogisticsId=" + ledgerLogisticsId + "]下没有运单");
+        if (orders.isEmpty()) return R.failed("物流对账单[ledgerLogisticsId=" + ledgerLogisticsId + "]下没有运单");
 
         //查询运单
         LambdaQueryWrapper<KllOrderTask> wrapperOrderTask = new LambdaQueryWrapper<>();
@@ -193,6 +193,7 @@ public class KwpLedgerLogisticsServiceImpl extends ServiceImpl<KwpLedgerLogistic
 
         List<KllOrderTask> tasks = kllOrderTaskMapper.selectList(wrapperOrderTask);
         //组装数据
+        List<KwpLedgerLogisticsOrder> finalOrders = orders;
         List<ResponseKllOrderTask> responseKllOrderTasks = tasks.stream().map(task -> {
             ResponseKllOrderTask orderTask = new ResponseKllOrderTask();
             orderTask.setId(task.getId().toString());
@@ -206,9 +207,9 @@ public class KwpLedgerLogisticsServiceImpl extends ServiceImpl<KwpLedgerLogistic
             orderTask.setFirstWeight(task.getFirstWeight());
             orderTask.setSecondWeight(task.getSecondWeight());
 
-//            orderTask.setFirstWeightTime(task.getFirstWeightTime());
-//            orderTask.setSecondWeightTime(task.getSecondWeightTime());
-//            orderTask.setOrderNo(task.getOrderNo());
+            orderTask.setFirstWeightTime(DateTimeUtil.format(task.getFirstWeightTime(), "yyyy-MM-dd HH:mm:ss"));// task.getFirstWeightTime());
+            orderTask.setSecondWeightTime(DateTimeUtil.format(task.getSecondWeightTime(), "yyyy-MM-dd HH:mm:ss"));
+            orderTask.setOrderNo(finalOrders.stream().filter(order -> order.getLOrderId().intValue() == task.getOrderId().intValue()).toList().get(0).getLOrderNo());//  task.getOrderNo());
             return orderTask;
         }).collect(Collectors.toList());
 

src/main/java/com/sckw/freight/service/kll/IKllOrderLogisticConfigService.java

@@ -0,0 +1,16 @@
+package com.sckw.freight.service.kll;
+
+import com.sckw.freight.entity.kll.KllOrderLogisticConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 物流商订单选项配置表 服务类
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-16
+ */
+public interface IKllOrderLogisticConfigService extends IService<KllOrderLogisticConfig> {
+
+}

src/main/java/com/sckw/freight/service/kll/impl/KllOrderLogisticConfigServiceImpl.java

@@ -0,0 +1,20 @@
+package com.sckw.freight.service.kll.impl;
+
+import com.sckw.freight.entity.kll.KllOrderLogisticConfig;
+import com.sckw.freight.mapper.kll.KllOrderLogisticConfigMapper;
+import com.sckw.freight.service.kll.IKllOrderLogisticConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物流商订单选项配置表 服务实现类
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-16
+ */
+@Service
+public class KllOrderLogisticConfigServiceImpl extends ServiceImpl<KllOrderLogisticConfigMapper, KllOrderLogisticConfig> implements IKllOrderLogisticConfigService {
+
+}

src/main/java/com/sckw/freight/service/saas/ISaasLogisticCustomerService.java

@@ -0,0 +1,16 @@
+package com.sckw.freight.service.saas;
+
+import com.sckw.freight.entity.saas.SaasLogisticCustomer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 物流贸易商客户信息 服务类
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-17
+ */
+public interface ISaasLogisticCustomerService extends IService<SaasLogisticCustomer> {
+
+}

src/main/java/com/sckw/freight/service/saas/impl/SaasLogisticCustomerServiceImpl.java

@@ -0,0 +1,20 @@
+package com.sckw.freight.service.saas.impl;
+
+import com.sckw.freight.entity.saas.SaasLogisticCustomer;
+import com.sckw.freight.mapper.saas.SaasLogisticCustomerMapper;
+import com.sckw.freight.service.saas.ISaasLogisticCustomerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物流贸易商客户信息 服务实现类
+ * </p>
+ *
+ * @author xj
+ * @since 2025-01-17
+ */
+@Service
+public class SaasLogisticCustomerServiceImpl extends ServiceImpl<SaasLogisticCustomerMapper, SaasLogisticCustomer> implements ISaasLogisticCustomerService {
+
+}

src/main/resources/com/sckw/freight/mapper/kll/KllOrderLogisticConfigMapper.xml

@@ -0,0 +1,5 @@
+<?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.freight.mapper.kll.KllOrderLogisticConfigMapper">
+
+</mapper>

src/main/resources/com/sckw/freight/mapper/saas/SaasLogisticCustomerMapper.xml

@@ -0,0 +1,5 @@
+<?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.freight.mapper.saas.SaasLogisticCustomerMapper">
+
+</mapper>