开发：去掉货单编号类型

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -133,7 +133,6 @@ public class GoodsOrderController {
 //                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
                     orderGoods.setOrderNo(orderNo);
-                    orderGoods.setOrderGoodsType(OrderGoodsTypeEnum.Status.PLATFORM.getCode());
                     orderGoods.setOrderGoodsNo(String.valueOf(beginOrderGoodsId));
                     orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
                     orderGoods.setSendAddressId(orderInfo.getSendAddressId());
@@ -197,7 +196,6 @@ public class GoodsOrderController {
 //                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
                     orderGoods.setOrderNo(orderNo);
-                    orderGoods.setOrderGoodsType(OrderGoodsTypeEnum.Status.PLATFORM.getCode());
                     orderGoods.setOrderGoodsNo(String.valueOf(beginOrderGoodsId));
                     orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
                     orderGoods.setSendAddressId(orderInfo.getSendAddressId());

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsTruckBindDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.OrderGoodsTruckBindMapper;
+import com.clx.performance.model.OrderGoodsTruckBind;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: huyufan
+ * @Description: 货单定向绑定车辆表
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMapper, OrderGoodsTruckBind, Integer> {
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -45,7 +45,6 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
         return Optional.of(orderGoodsNo)
                 .map(item -> lQrWrapper()
-                        .eq(OrderGoods::getOrderGoodsType, item.substring(0,2))
                         .eq(OrderGoods::getOrderGoodsNo, item.substring(2))
                 )
                 .map(super::getOne);
@@ -55,8 +54,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
         return Optional.of(orderGoodsNo)
                 .map(item -> lQrWrapper()
-                        .eq(OrderGoods::getOrderGoodsType, item.substring(0,2))
-                        .eq(OrderGoods::getOrderGoodsNo, item.substring(2))
+                        .eq(OrderGoods::getOrderGoodsNo, item)
                 )
                 .map(super::getOne);
     }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.mapper.OrderGoodsTruckBindMapper;
+import com.clx.performance.model.OrderGoodsTruckBind;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: huyufan
+ * @Description: 货单定向绑定车辆表
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindMapper, OrderGoodsTruckBind, Integer> implements OrderGoodsTruckBindDao {
+
+}

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDriverTruckListener.java

 package com.clx.performance.listener;
 
-import cn.hutool.json.JSON;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -8,7 +7,6 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsTruckBindMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.OrderGoodsTruckBind;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @Author: huyufan
+* @Description: 货单定向绑定车辆
+* @Date: 2023/09/18 11:34:50
+* @Version: 1.0
+*/
+
+@Mapper
+public interface OrderGoodsTruckBindMapper extends BaseMapper<OrderGoodsTruckBind> {
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -31,10 +31,6 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @TableField("order_goods_type")
-    @ApiModelProperty("货单编号类型")
-    private String orderGoodsType;
-
     @TableField("order_goods_no")
     @ApiModelProperty("货单编号")
     private String orderGoodsNo;

performance-web/src/main/java/com/clx/performance/model/OrderGoodsTruckBind.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 货单定向绑定车辆表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_goods_truck_bind")
+public class OrderGoodsTruckBind implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("truck_no")
+    @ApiModelProperty("车牌号")
+    private String truckNo;
+
+    @TableField("order_no")
+    @ApiModelProperty("订单编号")
+    private String driverUserNo;
+
+    @TableField("order_goods_no")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}