承运优化

performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderChildParam.java

@@ -7,6 +7,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
 /**
  * @Author liruixin
  * @create 2023-09-19 13:33
@@ -17,6 +20,9 @@ import lombok.ToString;
 @ToString
 public class PageCarrierOrderChildParam extends PageParam {
 
+    @ApiModelProperty(value = "货单编号")
+    private String orderGoodsNo;
+
     @ApiModelProperty(value="运单编号",example = "201457878")
     private String childNo;
 
@@ -44,6 +50,9 @@ public class PageCarrierOrderChildParam extends PageParam {
     @ApiModelProperty(value = "车牌号",example = "晋A12345")
     private String truckNo;
 
+    @ApiModelProperty(value = "运单状态集合")
+    private List<Integer> statusList;
+
 
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/QueryOrderChildsListByParam.java

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryOrderChildsListByParam extends PageParam {
+
+    @ApiModelProperty(value = "运单状态集合")
+    private List<Integer> statusList;
+
+    @ApiModelProperty(value = "货单编号")
+    @NotBlank(message = "货单编号不能为空")
+    private String orderGoodsNo;
+
+}

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

@@ -24,4 +24,10 @@ public class OrderChildPCVO {
 
     @ApiModelProperty("运单状态：10：已接单 20：支付 30：前往货源地 40：到达货源地 50：装货成功 60：前往目的地 70：到达目的地 80：收货待确认 90：待结算 100：完成 110：司机取消 111：平台取消")
     private Integer status;
+
+    @ApiModelProperty("司机姓名")
+    private String driverName;
+
+    @ApiModelProperty("司机手机号")
+    private String driverMobile;
 }
\ No newline at end of file

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

@@ -36,6 +36,9 @@ public class OrderGoodsVO {
     @ApiModelProperty("已拉运吨数")
     private BigDecimal alreadyTransportWeight;
 
+    @ApiModelProperty("已装车吨数")
+    private BigDecimal alreadyLoadWeight;
+
     @ApiModelProperty("发货地址ID")
     private Integer sendAddressId;
 

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

@@ -2,16 +2,11 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
-import com.clx.performance.model.OrderGoods;
-import com.clx.performance.param.pc.OrderGoodsCancelParam;
-import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
-import com.clx.performance.param.pc.OrderGoodsParams;
-import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
+import com.clx.performance.param.pc.*;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
@@ -22,11 +17,9 @@ import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.exception.ServiceSystemException;
 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.apache.commons.lang.exception.ExceptionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -122,8 +115,8 @@ public class GoodsOrderController {
     @ApiOperation(value = "查看货单详情-相关运单", notes = "<br>By:胡宇帆")
     @GetMapping("/getOrderChildInfoByOrderGoodsNo")
     @UnitCovert(param = false)
-    public Result<List<OrderChildPCVO>> getOrderChildInfoByOrderGoodsNo(@RequestParam String orderGoodsNo) {
-        return Result.ok(orderChildService.getOrderChildInfoByOrderGoodsNo(orderGoodsNo));
+    public Result<List<OrderChildPCVO>> getOrderChildInfoByOrderGoodsNo(@RequestBody @Validated QueryOrderChildsListByParam param) {
+        return Result.ok(orderChildService.getOrderChildInfoByOrderGoodsNo(param));
     }
 
     @ApiOperation(value = "查看货单列表", notes = "<br>By:胡宇帆")

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

@@ -58,7 +58,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
 
-    Optional<List<OrderChild>> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo);
+    List<OrderChild> getOrderChildInfoByOrderGoodsNo(QueryOrderChildsListByParam param);
 
     OrderChild getGoingLatestOrderChild(Long driverUserNo);
 

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

@@ -224,8 +224,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public Optional<List<OrderChild>> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo) {
-        return Optional.of(list(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)));
+    public List<OrderChild> getOrderChildInfoByOrderGoodsNo(QueryOrderChildsListByParam param) {
+        return list(lQrWrapper()
+                .eq(OrderChild::getOrderGoodsNo, param.getOrderGoodsNo())
+                .in(CollectionUtil.isNotEmpty(param.getStatusList()),OrderChild::getOrderGoodsNo,param.getStatusList()));
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -6,10 +6,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.feign.CancelOrderGoodsParam;
-import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
-import com.clx.performance.param.pc.PageCarrierOrderChildParam;
-import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
-import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
@@ -61,7 +58,7 @@ public interface OrderChildService {
 
     IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
 
-    List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo);
+    List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(QueryOrderChildsListByParam param);
 
     CarrierOrderChildDetailVO getCarrierOrderChildDetail(String childNo);
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -39,10 +39,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.feign.CancelOrderGoodsParam;
-import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
-import com.clx.performance.param.pc.PageCarrierOrderChildParam;
-import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
-import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.param.pc.*;
 import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.*;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
@@ -2144,9 +2141,8 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     @Override
-    public List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo) {
-        List<OrderChild> orderChildren = orderChildDao.getOrderChildInfoByOrderGoodsNo(orderGoodsNo).orElseThrow(
-                PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+    public List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(QueryOrderChildsListByParam param) {
+        List<OrderChild> orderChildren = orderChildDao.getOrderChildInfoByOrderGoodsNo(param);
         return orderChildStruct.convertList(orderChildren);
     }
 

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

@@ -119,6 +119,7 @@ public class OrderChildSqlProvider {
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pay_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("pay_time <= #{param.endTime}");}
 
+            if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {WHERE("order_goods_no = #{param.orderGoodsNo}");}
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}
             if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}

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

@@ -32,7 +32,8 @@ public class OrderGoodsSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
-                    " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ," +
+                    " a.already_transport_weight,a.already_load_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," +
                     " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +