开发：去掉货单编号类型

performance-api/src/main/java/com/clx/order/params/PageOrderGoodsListParam.java

@@ -21,9 +21,6 @@ public class PageOrderGoodsListParam extends PageParam {
     @ApiModelProperty(value = "货单编号")
     private String orderGoodsNo;
 
-    @ApiModelProperty(value = "货单编号类型")
-    private String orderGoodsType;
-
     @ApiModelProperty(value = "货单状态： 10：已挂单  20：挂单中 30：运输中 40：已完成 50：已取消")
     private Integer orderGoodsStatus;
 

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsTypeEnum.java

-package com.clx.performance.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-public enum OrderGoodsTypeEnum {
-    ;
-
-    @Getter
-    @AllArgsConstructor
-    public enum Status {
-
-        PLATFORM("PT", "平台"),
-        ;
-
-        private final String code;
-        private final String name;
-
-        public static Optional<Status> getByCode(String code) {
-            return Arrays.stream(values()).filter(e -> e.code .equals(code)).findFirst();
-        }
-    }
-
-
-}

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -26,9 +26,6 @@ public class OrderGoodsVO {
     @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("货单编号类型")
-    private String orderGoodsType;
-
     @ApiModelProperty("货单编号")
     private String orderGoodsNo;
 

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

 package com.clx.performance.controller.app;
 
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.order.feign.OrderFeign;
-import com.clx.order.params.OrderGoodsChildParams;
-import com.clx.order.params.OrderGoodsParams;
-import com.clx.order.params.PageCarrierOrderListParam;
-import com.clx.order.params.PageOrderGoodsListParam;
-import com.clx.order.vo.feign.FeignOrderVO;
-import com.clx.order.vo.feign.FeignPageOrderVO;
-import com.clx.performance.component.OrderGoodsIdGenerate;
-import com.clx.performance.constant.RabbitKeyConstants;
-import com.clx.performance.constant.RedisConstants;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.OrderGoodsTypeEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
-import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
-import com.msl.common.utils.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @ClassName GoodsOrderController
  * @Description

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

@@ -13,7 +13,6 @@ import com.clx.performance.component.OrderGoodsIdGenerate;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.OrderGoodsTypeEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.OrderGoodsService;
@@ -25,7 +24,6 @@ import com.msl.common.utils.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.Message;
@@ -258,10 +256,6 @@ public class GoodsOrderController {
     @PostMapping("/pageOrderGoodsList")
     @UnitCovert(param = false)
     public Result<PageData<OrderGoodsVO>> pageOrderGoodsList(@RequestBody PageOrderGoodsListParam param) {
-        if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
-            param.setOrderGoodsType(param.getOrderGoodsNo().substring(0, 2));
-            param.setOrderNo(param.getOrderGoodsNo().substring(2));
-        }
         IPage<OrderGoodsVO> page = orderGoodsService.pageOrderGoodsList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -19,8 +19,8 @@ public class OrderGoodsSqlProvider {
 
     public String pageOrderGoodsList(@Param("page") Page<FeignPageOrderVO> page, @Param("param") PageOrderGoodsListParam param) {
         String sql = new SQL() {{
-            SELECT("a.id, a.order_no, a.order_goods_type," +
-                    " concat(a.order_goods_type,a.order_goods_no) as order_goods_no, a.order_goods_status, a.extract_weight, " +
+            SELECT("a.id, a.order_no," +
+                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
                     " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +